messily upgrading this to latest ember