Initial implementation
Merge branch 'ffos-initial'