Cleaning

also finished "wired"