Yinadele's gallore: Breaking Shit

refer to commits for details on changes