Added files, merged jesse's changes'