reworking some things wip