updated more code - still not ready for prime time