Update with moppable version of montage

The build looks ready to go