First commit from Jim

Please review
- jim