diff --git a/TODO.md b/TODO.md
new file mode 100644
index 0000000..b4e1c61
--- /dev/null
+++ b/TODO.md
@@ -0,0 +1,158 @@
+# KeyKoala Password Manager TODO
+
+## Current Priority Tasks
+- [x] Basic GUI implementation
+- [x] Basic encryption functionality
+- [x] Local storage implementation
+- [x] Password viewing/copying
+- [ ] Fix import paths issue
+- [ ] Add proper salt management
+- [ ] Add error handling for basic operations
+- [ ] Add basic input validation
+
+## Core Features (Next Phase)
+- [ ] Password generation functionality
+  - [ ] Configurable length
+  - [ ] Character type selection (special chars, numbers, etc.)
+  - [ ] Copy to clipboard button
+- [ ] Password strength checker
+  - [ ] Visual indicator
+  - [ ] Suggestions for improvement
+- [ ] Search functionality
+  - [ ] Real-time filtering
+  - [ ] Search by site/username
+- [ ] Export/Import functionality
+  - [ ] CSV export
+  - [ ] CSV import
+  - [ ] Encrypted backup file
+
+## UI Improvements
+- [ ] Dark mode support
+- [ ] Responsive window sizing
+- [ ] Better password entry layout
+- [ ] Status messages/feedback
+- [ ] Loading indicators
+- [ ] Context menu improvements
+- [ ] Keyboard shortcuts
+- [ ] System tray integration
+
+## Security Enhancements
+- [ ] Master password strength requirements
+- [ ] Auto-logout timer
+- [ ] Failed login attempt limiting
+- [ ] Secure password reset mechanism
+- [ ] Session management
+- [ ] Encryption version tracking
+
+## Organization Features
+- [ ] Password categories/folders
+- [ ] Tags for entries
+- [ ] Favorites system
+- [ ] Notes field for entries
+- [ ] Last modified tracking
+- [ ] Usage history
+
+## Future Database Migration
+- [ ] PostgreSQL Integration
+  - [ ] Database schema design
+  - [ ] User table
+  - [ ] Password entries table
+  - [ ] Categories table
+  - [ ] Migration script from local storage
+  - [ ] Environment configuration
+  - [ ] Connection pooling
+  - [ ] Error handling
+  - [ ] Backup system
+
+## Testing
+- [ ] Unit tests
+  - [ ] Encryption tests
+  - [ ] Storage tests
+  - [ ] GUI tests
+- [ ] Integration tests
+- [ ] Security tests
+- [ ] Performance tests
+
+## Documentation
+- [ ] User guide
+- [ ] Installation instructions
+- [ ] Security documentation
+- [ ] API documentation
+- [ ] Contributing guidelines
+- [ ] Code comments
+
+## Code Quality
+- [ ] Type hints
+- [ ] Logging system
+- [ ] Error handling improvements
+- [ ] Code organization
+- [ ] Performance optimizations
+- [ ] Code style consistency
+
+## Distribution
+- [ ] Setup script
+- [ ] Requirements management
+- [ ] Version management
+- [ ] Release process
+- [ ] Update mechanism
+
+## Nice-to-Have Features
+- [ ] Browser extension integration
+- [ ] Biometric authentication
+- [ ] Password sharing
+- [ ] Emergency access
+- [ ] Custom fields
+- [ ] Attachment support
+- [ ] Password history
+- [ ] Activity log
+
+## System Integration
+- [ ] Startup with system
+- [ ] Desktop notifications
+- [ ] Clipboard clearing
+- [ ] Auto-type functionality
+- [ ] System keyring integration
+
+## Maintenance
+- [ ] Regular security audits
+- [ ] Dependency updates
+- [ ] Performance monitoring
+- [ ] Bug tracking system
+- [ ] User feedback system
+
+## Project Management
+- [ ] Version control strategy
+- [ ] Issue templates
+- [ ] PR templates
+- [ ] CI/CD pipeline
+- [ ] Code review process
+
+## Notes
+- Keep security as the top priority
+- Maintain simplicity in the UI
+- Focus on stability before adding new features
+- Regular security audits
+- User feedback collection
+
+## Timeline
+### Phase 1 (Current)
+- Basic functionality
+- Core security features
+- Essential UI elements
+
+### Phase 2
+- UI improvements
+- Organization features
+- Testing implementation
+
+### Phase 3
+- Advanced features
+- Database migration
+- Distribution system
+
+### Phase 4
+- System integration
+- Browser extension
+- Advanced security features
+
+