What needs to happen to get this bit refactored?