A lot of fixing and some addition of some functionality
Checkin of new files for the new functionality