Added test stub
More work, almost good enough for first version