initial commit - errors debugged