Added options and stuff
0.2.0