merged with ember-model WIP (ca054a63b0acba037a0ac0d02c89813a5db2a0b4)

Signed-off-by: Floyd Pink <imbleedingme@googlemail.com>