Initial commit of Q5 revamp