Finish up coding

Finish up coding