Migrated todo note from trunk index to the proper place within the Core.class.php