Starting on hug()

Probably some whitespace stuff too