[broken] refactoring continued

- loading now works, but buggy