Version 12

Nearly complete