Much changes

A whole day's work... should've been commited in stages but who cares
about rules right?