Adding back methods piece by piece to get to where we can implement SUnit.