progress
rearrange things a bit more
more progress