Cleaned up. Starting from scratch.