Cleaned up some more started working on intergration. Commiting to save progress and let others work