finished skeleton and added more fields