Almost done
Almoster done