-removed arrraylist for enum. 
-if statement used instead to call enum objects