fixed some things based on recent code review
added Skeleton class (to be completed soon)