WIP: refactor: tweaks for ember integration