Add working skeleton