Working on unit testing, final commit for the night