Finished all of my portions for proto