Cleaning up pin interface, breaking lots of things