Re-apply yesterdays shelved changes, separating drag calc functionality out so it can work without a boat (wip, but maintains current functionality still)