Adding tests and methods to the code..