Updated header date. Tried switching to ServiceLoader, but Eclipse wont play nice. Bashing head trying to work out what to do with the *type* of instances