Finished moving over prototype code