Trying to package everything