Still need to write some tests #fail