diff --git a/src/HWintegration.jl b/src/HWintegration.jl
index 68ef546..09e7685 100644
--- a/src/HWintegration.jl
+++ b/src/HWintegration.jl
@@ -1,7 +1,7 @@
 
 module HWintegration
 
-	const A_SOL = -18  # enter your analytic solution. -18 is wrong.
+	const A_SOL = 4  # enter your analytic solution. -18 is wrong.
 
 	# imports
 	using FastGaussQuadrature
@@ -18,38 +18,79 @@ module HWintegration
 
 	# demand function
 
+	q(p) = 2p^(-0.5)
+
 	# gauss-legendre adjustment factors for map change
 
+	a = 1
+	b = 4
+	adj1 = (b - a)/2
+	adj2 = (a + b)/2
+
 	# eqm condition for question 2
 
+	egm_cond(θ1,θ2,p) = exp(θ1).*p^(-1) .+ exp(θ2).*p^(-0.5) - 2
+
 	# makes a plot for questions 1
 	function plot_q1()
-
+		plot(p->q(p),0.5,5,label="Q")
+		vline!([1,4],color=:red)
 	end
 
 
 	function question_1b(n)
-
+		nodes, weights = gausslegendre(n)
+		nodes_points = Vector{Float64}(n)
+		for i in 1:n
+			nodes_points[i] = adj1*nodes[i] + adj2
+			nodes[i] = q(adj1*nodes[i] + adj2)
+		end
+		plot_q1()
+		vline!(nodes_points,color=:blue)
+		res = adj1*dot(nodes,weights)
+		println(res)
 	end
 
 
 	function question_1c(n)
-
-		
+		nodes_points = rand(n)*(b-a) + a
+		nodes = Vector{Float64}(n)
+		for i in 1:n
+			nodes[i] = q(nodes_points[i])
+		end
+		plot_q1()
+		vline!(nodes_points,color=:blue)
+		res = dot(ones(n),nodes)*(b-a)/n
+		println(res)
 	end
 
 	function question_1d(n)
-
-	
-
+		s = SobolSeq(1)
+		nodes_points = hcat([next(s)*(b-a) + a for i = 1:n]...)'
+		nodes = Vector{Float64}(n)
+		for i in 1:n
+			nodes[i] = q(nodes_points[i])
+		end
+		plot_q1()
+		vline!(nodes_points,color=:blue)
+		res = dot(ones(n),nodes)*(b-a)/n
+		println(res)
 	end
 
 	# question 2
 
 	function question_2a(n)
-
-		
-
+		nodes, weights = gausshermite(n)
+		mat_cov = hcat([0.02, 0.01],[0.01,0.01])
+		nodes_kron = hcat(kron(ones(n),nodes),kron(nodes,ones(n)))
+		weights_kron = kron(weights,weights)
+		nodes_adj = chol(mat_cov)*nodes_kron'
+		nodes_res = Vector{Float64}(n*n)
+		for i in 1:(n*n)
+			nodes_res[i] = fzero(p->egm_cond(nodes_adj[1,i],nodes_adj[2,i],p),1.0)
+		end
+		res = dot(weights_kron,nodes_res)
+		return res
 	end
 
 	function question_2b(n)
@@ -72,24 +113,27 @@ module HWintegration
 		for n in (10,15,20)
 			info("============================")
 			info("now showing results for n=$n")
-			# info("question 1b:")
-			# question_1b(n)	# make sure your function prints some kind of result!
-			# info("question 1c:")
-			# question_1c(n)
-			# info("question 1d:")
-			# question_1d(n)
-			# println("")
+			info("question 1b:")
+			question_1b(n)	# make sure your function prints some kind of result!
+			info("question 1c:")
+			question_1c(n)
+			info("question 1d:")
+			question_1d(n)
+			println("")
 			info("question 2a:")
-			q2 = question_2a(n)
-			println(q2)
-			info("question 2b:")
-			q2b = question_2b(n)
-			println(q2b)
-			info("bonus question: Quasi monte carlo:")
-			q2bo = question_2bonus(n)
-			println(q2bo)
+			if n == 10
+				q2 = question_2a(n)
+				println(q2)
+			end
+			#info("question 2b:")
+			#q2b = question_2b(n)
+			#println(q2b)
+			#info("bonus question: Quasi monte carlo:")
+			#q2bo = question_2bonus(n)
+			#println(q2bo)
 		end
 	end
+	runall()
 	info("end of HWintegration")
 
 end
diff --git a/test/runtests.jl b/test/runtests.jl
index 1bb9cb0..bb984d7 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -5,7 +5,7 @@ using Base.Test
 @testset "HWintegration Unit Tests" begin
 	@testset "testing components" begin
 		@testset "check demand" begin
-			@test 1==1
+			@test HWintegration.q(4) == 1
 		end
 
 
@@ -13,11 +13,17 @@ using Base.Test
 		end
 
 		@testset "eqm condition for Q2" begin
+			@test egm_cond.q(0,0,1) == 0
 		end
 	end
 
 	@testset "Testing Results" begin
-
+		@test HWintegration.question_1b(20) > 3.5
+		@test HWintegration.question_1c(20) > 3.5
+		@test HWintegration.question_1d(20) > 3.5
+		@test HWintegration.question_1b(20) < 4.5
+		@test HWintegration.question_1c(20) < 4.5
+		@test HWintegration.question_1d(20) < 4.5
 	end
     
 end