Updated - Adding New Functionality

Making first set of improvements