Catkinization WIP

Still needs some cleanup. Please do not merge yet.
Also includes some non related commits.
WIP...