Factory working as if! Cleaned out old stuff and reordered includes and dependencies.