Added user management and bottle ownership
Modifier additions and updates.