[Issue #354][WIP] finished all views and logic, uml left