Changing everything to use janus