Decided I was happy with the hack as it stands