Removed cron ... needs more thought