refactoring code around, removed skeleton object for now.
updates to structure.