Working copy, cleaned up, ready to submit