Initial working commit Basic Functionality