Finalized Assignment

Everything should be working by now