added everything prior to merge. Lazy I know