Moved future code (beyond JRF) to new file