wip putting things together