Adding a gen_server to do the actual work.
Adding a server.
Merge conflicts.