Point of return

Working on unit tests. I might need to go back to this point since I
will possible introduce big changes next.