Last commit before turning everything into Java Object.