Refactor stuff.
Improve loading mechanics. More tests.