quick fix for interfaces - must check if it is complete
Merge remote-tracking branch 'myWALA/inflorit' into inflorit-with-tests