Finally got organized, sort of