Added the cabin class made by Haakon, and did you refactoring