Jessica and Tom's code combined commit