More fetch work and removed Main.java