Work on #161 and #141 - FLI and C++