Some additions of code, nearer a complete base but still a long way to go