Completed #15, there is still an issue with #14
Will try and work it out