First commit, initial files to sync with Jimmy
Merge https://github.com/Lowrenz/wave