First changes and testing gate1, gate2 and cv1 working