adding in a bunch of stuff and getting everything to look right