Combine all commits into one

Rewrite history to fix broken repo