Add half finished re-write of procurator