second commit
Completed unit tests
Completed numbers and variables