final changes

this is what i have sooooo far.