Initial Commit V3

Use dr java for this because IntelliJ won't work with it :/