continuing with #61 and unit testing