refactor / added mobile home support