Everything done except testing cron job