More tests and refactoring. Adding in stubs mostly so that I can come back and add actual data later.