Bunch of new stuff...
Getting this shit out of hand :-(