stage 1 of tidying this shit up