v1.04, pre 1.1 commit

Hopefully last commit to in-dev before v1.1. The mission should be
functional and will be pulled after testing.