Seems like all is done, except error implementing