Still working on refactored Bath class