refactoring all code and making sure everything is hooked up correctly
bumping version