Feature set

Needs a little more work but want to integrate today's work