Merging of base functionalllty

tra la la