Fucktored storages w/tests.
Other fucktorings.