Intakes

Added some intakes, fixed some things.