Merging with jesse
Really close to work