general work
more progress