Simplified Logic

Removed extra loops and dictionaries
Simplified (again)

Synching issue. re-synch