Pretty much in a production stage.. I'm going to try merging into master