1st commit. aint doing what it supposed to be doing