cleaned up, moving to dev branch