Uncommented some unimplemented code