Starting work on uses constraints DONT MERGE

Currently throws an NPE when saving Packages
with USES constraints.