Finished, fixes#1

Finished. I hope.