Five More Minutes – 13Jun17

Luna Update – Basically, need more tests.