Make-up Classes

Re-work of missed classes