restructures a bit to be more gemmy