Added functionality classes and basic shell of variables