Clashsoft Commit

Shrek is going to hate me for this