Updated to Angular and Ratchet
removed ww1