Added some stucture to prepare for more depth in classes