First non-functional skeleton commit