Adding everything so far. It should be working, or at least
should be for the one system I've tried it on.