I really need to add unit tests