Pushing antonio's code for the checklist

TODO: Have the code integrated in