second commit - rough prioject structure