0.1.1

Started rearranging and implementing Tim's corrections