Revert "taking out the ugly stuff. Back to work!"

This reverts commit eb81a30a016167981a7a88681c00367612987fd3.