v0.2

Finished code, catching any errors thrown