Started adding logic for initial load