Finally works. Cleanup to start actual features.