Shitty version of butter code cleaning up in next commit