Added a chore concept so we can decouple the code better