edited commandParser

changed methods to throw exception,
changed other things to match database class
Merge branch 'Logic'