lots of updates, wip