Begin code reworking

beginning the reworking of maunz's code, starting with main.java