Started working on some more functionality, then my brain fried itself for the day.