For merge

Lots more stuff in here. ;D