Working on finishing off the 1.0