lots of refactoring and changes, assets, some stuff still broken though