Nearing version 1 complete