More wip updates