Got basic test passing, doing a simple replacement