Added lots 'o goodies. o/