Working towards removing the separate lists

Should've been done with that by now. Procrastination, ho