#13 Added functionality, test required