almost done commit, some consol.logs to remove and comments to rewrite.
working