Initial checkin of scaffolding