All basic features have been added in. user interface is next to get coded.
Merge remote-tracking branch 'origin/master'