Worked on pump

Still need to work on this more to fix some issue before the 1.5 update
cleanup