Figured out how to get rid of the nasty private include...duh...metadata! Also implemented collection updating.