Working on JxWaitUntil, some cleaning up could happen but works for now