Adding back in titles. Closes #15