Comitting up before changing Model to singleton