FR's complete

Ready for tests and code cleaning.
Once that's passed -- baseline