Refactor. More tests. Getting There