Thanks Lambda! Noted on the shakiness, we haven't touched that in a while so it might be worth revisiting.
