Getting Serious a bit

Moving stuff to classes and commenting code