Mike commit

-Everything all done except Strategy!!!