did some stuff for 1.4 form

however still not finished :(