Cleaned up mess & started over