Commit 94

Trying to make borders work still.