Mixing in ErikZalm Marlin_v1 into this repo