BROKEN STATE: Refactored out some objects.