Wip/p code

Seems like most of the changes come from the fact that all of ace is included in this PR.
Not sure why this is and it's something we have to ask @Warry.