Broke out some functionality.