some work has been done...
more changes