First working version - not enough tests