started moving stuff into wire template