Started work on new manifest class