refactor so that standalone browser only Model class can be built