Tinkering around the edges. What was I waiting for?