flat form done
Device dynamic adder working basically
Fixed merge