ccampbell/luna 4 commits