WIP
WIP.
Tidied.