Alyssa/add wire support

updated