done for now with 1.3, some stuff left to do