Comments added, about to merge src and test folders