Cleaned up to start from scratch.