more progress..
wip