PLus some TODO for fmplus
Merge branch 'test'