completely revamped and removed ember