proper naming
more structure stuff