Final class version
Merge branch 'master' of https://github.com/AbyssalMuse/Pantry-Butler