towards packaging the whole thing