WIP
Comments addressed.