Issue #141: Some work on the FLI layer