WIP changes to make a package style system, probably not working!