forgot to commit. added lots of stuf. i suck