Pretty much done. Commented.