Updating repo with AJ's work where he left off.