Add skeleton and modify startup