1-2 C Almost Finished. Some fix to do