Updates to rift service and work on gui...