Combined Movement and Jump into CalculateTotalMovement, kept the functions separate to allow for mechanical tweaking to each separately.  Began working on a smoother jump and implemented the calculateJumpingVelocity in PhysicsFuncts.