Method headers and comments; cleanup; added a basic shell for the demo