Major overhaul for security and functionality.