added more stuff. this is starting to get fugly...