Built 2nd iteration of the Trubbles page
Finished merge