Lab 6 Code

Cleened up some code and removed some old functions