merging legacy code and michaels project

merging my stuff into this repo to keep it, will clean up later