Fix the awfulness
Add Wyatt magic