merging
merging
working on commenting out stuff
working on commenting out stuff
merging
merging
Made files bigger