Fixing things..refactoring:wq