Cleanup and work on w5 pres
w5 pres stuff