Added first classes. Very dirty/beta since now