Add beginnings of tier system
Merge with gate count