Cleaned up parts of mess, still very ugly