break these out into a gem structure