#6 - Adding room order and serializer