started on mockup requirements refactoring