Week 3

Debug complete