last commit was not correct, fixed it
changed wires layout, don't know how to not commit some files
fixed merge conflicts