add full Sola support, and temporary P and U