so this is actually a ton of changes because i'm terrible and haven't committed in forever.