Improve graphing, genericise for multiple rooms