a few more changes, a few hours from now I should be done.