Replace drift feeding and max swim speed methods with current ones.
Additional stuff for replaced drift feeding method. Closes #32