Basic functionality working but no testing done yet. Last commit before refactoring AngularJS code