Merge jesse's files to mine