havent committed in a while, lots of changes and getting ready for move to ubuntu machine