Adding some functionality

Continued work
More Changes