Floe 130

@jhung I think this is ready - please provide any feedback.  thanks.