Add Erik's click changes, finish product