Adding new tests and includes.
new methods to do the work more succinctly. eventually anyway.