Began refactoring Assets class (again)