committing more code....needs to be debugged