update

Am still working on this, please let me know what you think.