Started adding logic