Cleaned up and ready for second attempt.