started refactoring frontend to match workshift