Working

Need to resolve some issues