Starting to add dummy classes and some bug fixes

Starting to add dummy classes and some bug fixes