Trying to make a proper package out of this thing.