Updating code to use structs, removing requirements.