Bring over a bunch of stuff from two scoops project