Re-enabled block selection code
Removed the leftover testing code