Reworked this as of the latest commit