Version 1 Complete

Might be a few bugs not sure