Some work to add ember