PRE-5 Commit

Lots of stuff here, changelog tomorrow...