Completation of code, still two method to wrtie and then test