Initial commit (pre-cleanup)