Refactored weaving info to be in a class to allow data access to be safer.
Instance proxies appear to work.