90% done :)