Whiny boi is whiny.

More upgrades to follow...