Better input validation
Implement data saving
Refactor data saving