Looks ready to merge

Quite a bit of stuff in here, might as well marge it