Cleaned it up a bit started making the structure for more complex stuff