Some features and refactoring up next.