Major refactoring to method calls.
added test to remind me where I left off...