Last commit before I try to make a .jar ^_^