Initial stuff + morse API start
Oops.
Merge branch 'master' into master-2