Cleaned things up, simplified. Got ember working...