New border, support for an external border, and some dirty test code.