Started refactoring to separate dao and view layers