Final content commit (for now)
Just needs testing. Found a bug already. \o/ -_-