Even more.... Should start implementing some tests I guess