put applicable back into class
put applicable back into class
put spec files together