Can we do this without adding 8 relatively long lines of redundant data?