Merged changes w/ Joe's; Moving Link between rooms not working