Filled gates
Refactored drawAll