WIP

This branch will be able to go away after I finish reviewing:
https://github.com/imagej/imagej/pull/15