Oops - and yeah that's a lot cleaner, still need to tidy up a bunch of other stuff elsewhere! still hitting that meta error variable error, although not sure if it's actually the GCI module causing the error