Move things around and added new Essentials