working core features
Merge pull request #6 from JSConnolly/core

working core features