Switched things up a lot.
No longer crashes on load