Continuing refactoring, implementing behaviors.