Organizing some functions
Updating checklist