More skeleton and initial validation