Working

I'll be updating my code all day with better style, but this is generally the merge. I ran my test suite on it and everything was cool, i'm going to try to run the smoketest as well when i get in