forgot some files last few commics, and some new code