added skeleton and fixed some things
resolve merge conflict