Added more skeletal code