#10 In Progress -  Improved docs