Implement some chores stuff