attempted refactor of the xkcd lab - work in progress