More organized

Working towards publishing