Updated and completed

Ready to submit for eval