WIP legacy port
merge master
legacy compatability complete
Add legacy specs to package
Merge legacy