Finished review with Jake

I think it is good to merge back to master