added skeleton and fixed some things