Cleaned up and working.