Functions and JDoc and testing done!