merged

added everything