First steps towards proper object; write unit testing