WIP - Major cleanup.