Finished all code follow throughs