Some more work to add ember