Adds functionality for give-now form
Fixes merge conflicts