second commit featuring better organization