whizbang branch

Looks awesome bro