WIP. trying to line it all up