+ fleshed out methods for the unit testing part