Almost done

TODO:
Leak detect
Package
Final test
Comment check