Started organizing, also some minor features