More code, most ripped from Beta 1 and needs refining.