Add classes that arrised from the traceability matrix 

Addresses #23