Adding Legacy
 Preparing for 2.1.0: major refactor of generics.. much simpler now