assets
continue refactoring
wip on forms