WIP
Tidying
Twiddling
More twiddling