wip - changes to design