client should provide Id not Keys
Merge branch 'timor/gapp' of github.com:Waog/b14h into timor/gapp