82 WIP (bit of a mess)