Updated to latest version

Room loading etc.
test