Seventh Commit

Not much, just edited some stuff and removed some test code.