Finally got things organized a bit.