Bits and pieces

Nothing major changed yet, mostly just messing around with button class
attempting to make the timer work