started refactoring effort, more to come
massive refactoring to make interface more user friendly