Added initial class and Spec