Make progress on skeleton/test