Begin writing unit test... better later than never ;)