No longer looks like shit.  [closes #18]