First commit after computer-reset. Lots of changes :P