Almost finished

Almost done