initial commit without johnny 5 integration yet