Dev 1.1 complete

refactoring to code..