after a lot of work.. have not committed in a while