Cleaned up and added the annotated changes. Compile Failing.