Just leaving this here so I can create an issue, and close it to make it seem like I'm doing something :sunglasses: Started work on this in the branch [criware](https://github.com/Azukee/Macaron/tree/criware)
