Reworking custom classes and preparing viewcontroller