Finished it?

TODO: comments