[deckar01]

Here are a couple diffs that leave out the copied code:

https://github.com/albrow/fo/compare/faf3c9f96a8ecd9d17ca968...

https://github.com/albrow/fo/compare/f76c531f839e5e76e5f6b7f...