Code is sound. Need to figure out how to do packages properly