in progress on front end and some model refactoring