Adam - adding some code to test theme components
Adam - attempting to fix some stuff