DO NOT MERGE THIS

This is just a pull request for commenting on the current code for QiiTa-pet