Jake

Updated and ready to be merged.