Caught up on old functionality. Refactoring to follow