bunch of changes whoa (this is a working copy from today)