adding all this ish