Started working on quad support