diff --git a/src/main/java/com/paneedah/weaponlib/CustomArmor.java b/src/main/java/com/paneedah/weaponlib/CustomArmor.java
index bbeab1c27..dc4a4a51e 100644
--- a/src/main/java/com/paneedah/weaponlib/CustomArmor.java
+++ b/src/main/java/com/paneedah/weaponlib/CustomArmor.java
@@ -6,6 +6,7 @@
 import com.paneedah.weaponlib.crafting.IModernCraftingRecipe;
 import com.paneedah.weaponlib.model.ModelBaseRendererWrapper;
 import com.paneedah.weaponlib.model.WrappableModel;
+import lombok.Getter;
 import net.minecraft.client.entity.AbstractClientPlayer;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelBiped;
@@ -197,8 +198,8 @@ public Builder withModelSupplier(Function<Integer, ModelBiped> modelFactory) {
 
         public Builder withCompatibleAttachment(AttachmentCategory category, ModelBase attachmentModel, String textureName,
                                                 Consumer<ModelBase> positioner) {
-            ItemAttachment<CustomArmor> item = new ItemAttachment<CustomArmor>(category, attachmentModel, textureName, null);
-            compatibleAttachments.put(item, new CompatibleAttachment<CustomArmor>(item, positioner));
+            ItemAttachment<CustomArmor> item = new ItemAttachment<>(category, attachmentModel, textureName, null);
+            compatibleAttachments.put(item, new CompatibleAttachment<>(item, positioner));
             return this;
         }
 
@@ -420,7 +421,7 @@ public CustomArmor buildBoots(boolean isClient) {
 
     //private EntityEquipmentSlot slot;
     private boolean hasNightVision;
-    private boolean vignetteEnabled;
+    @Getter private boolean vignetteEnabled;
     private float exposureReductionFactor;
 
     private SoundEvent breathingSound;
@@ -429,12 +430,12 @@ public CustomArmor buildBoots(boolean isClient) {
     //private boolean shieldEnabled;
     private long shieldRegenerationTimeout = 1000;
     private double shieldRegenerationRate = 1.0; // restored shield capacity per sec
-    private double maxShieldCapacity;
+    @Getter private double maxShieldCapacity;
     private final String unlocalizedArmorSetName;
-    private double shieldIndicatorPositionX;
-    private double shieldIndicatorPositionY;
-    private double shieldIndicatorWidth;
-    private double shieldIndicatorHeight;
+    @Getter private double shieldIndicatorPositionX;
+    @Getter private double shieldIndicatorPositionY;
+    @Getter private double shieldIndicatorWidth;
+    @Getter private double shieldIndicatorHeight;
     private String shieldIndicatorMaskTextureName;
     private String shieldIndicatorProgressBarTextureName;
 
@@ -645,10 +646,6 @@ public boolean hasNightVision() {
         return hasNightVision;
     }
 
-    public boolean isVignetteEnabled() {
-        return vignetteEnabled;
-    }
-
     @Override
     public Function<Float, Float> getAbsorbFunction(Spreadable spreadable) {
         return dose -> dose * (1f - exposureReductionFactor);
@@ -784,26 +781,6 @@ public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource s
         }
     }
 
-    public double getMaxShieldCapacity() {
-        return maxShieldCapacity;
-    }
-
-    public double getShieldIndicatorPositionX() {
-        return shieldIndicatorPositionX;
-    }
-
-    public double getShieldIndicatorPositionY() {
-        return shieldIndicatorPositionY;
-    }
-
-    public double getShieldIndicatorWidth() {
-        return shieldIndicatorWidth;
-    }
-
-    public double getShieldIndicatorHeight() {
-        return shieldIndicatorHeight;
-    }
-
     @Override
     public CraftingEntry[] getModernRecipe() {
         return this.modernRecipe;
diff --git a/src/main/java/com/paneedah/weaponlib/ItemMagazine.java b/src/main/java/com/paneedah/weaponlib/ItemMagazine.java
index 0f314d0a1..6e30dc90e 100644
--- a/src/main/java/com/paneedah/weaponlib/ItemMagazine.java
+++ b/src/main/java/com/paneedah/weaponlib/ItemMagazine.java
@@ -1,5 +1,6 @@
 package com.paneedah.weaponlib;
 
+import lombok.Getter;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -64,10 +65,10 @@ protected ItemAttachment<Weapon> createAttachment(ModContext modContext) {
 
     private ModContext modContext;
 
-    private final int capacity;
-    private List<ItemBullet> compatibleBullets;
-    private SoundEvent reloadSound;
-    private SoundEvent unloadSound;
+    @Getter private final int capacity;
+    @Getter private List<ItemBullet> compatibleBullets;
+    @Getter private SoundEvent reloadSound;
+    @Getter private SoundEvent unloadSound;
 
     ItemMagazine(ModelBase model, String textureName, int capacity) {
         this(model, textureName, capacity, null, null);
@@ -103,22 +104,6 @@ public void onCreated(ItemStack stack, World world, EntityPlayer player) {
         initializeTag(stack, 0);
     }
 
-    public List<ItemBullet> getCompatibleBullets() {
-        return compatibleBullets;
-    }
-
-    public int getCapacity() {
-        return capacity;
-    }
-
-    public SoundEvent getReloadSound() {
-        return reloadSound;
-    }
-
-    public SoundEvent getUnloadSound() {
-        return unloadSound;
-    }
-
     @Override
     public Part getRenderablePart() {
         return this;
diff --git a/src/main/java/com/paneedah/weaponlib/Tuple.java b/src/main/java/com/paneedah/weaponlib/Tuple.java
index 14ecf4232..22fcea833 100644
--- a/src/main/java/com/paneedah/weaponlib/Tuple.java
+++ b/src/main/java/com/paneedah/weaponlib/Tuple.java
@@ -1,5 +1,9 @@
 package com.paneedah.weaponlib;
 
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter @Getter
 public final class Tuple<U, V> {
 
     private U u;
@@ -11,20 +15,4 @@ public Tuple(U u, V v) {
         this.v = v;
     }
 
-    public U getU() {
-        return u;
-    }
-
-    public void setU(U u) {
-        this.u = u;
-    }
-
-    public V getV() {
-        return v;
-    }
-
-    public void setV(V v) {
-        this.v = v;
-    }
-
 }
diff --git a/src/main/java/com/paneedah/weaponlib/Weapon.java b/src/main/java/com/paneedah/weaponlib/Weapon.java
index 92011972d..2dec3671b 100644
--- a/src/main/java/com/paneedah/weaponlib/Weapon.java
+++ b/src/main/java/com/paneedah/weaponlib/Weapon.java
@@ -14,6 +14,7 @@
 import com.paneedah.weaponlib.render.shells.ShellParticleSimulator.Shell.Type;
 import dev.redstudio.redcore.utils.DecimalUtils;
 import io.redstudioragnarok.redcore.vectors.Vector3F;
+import lombok.Getter;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.model.ModelBase;
@@ -114,7 +115,7 @@ public static class Builder {
         private CreativeTabs creativeTab;
         private WeaponRenderer renderer;
         //float zoom = Weapon.DEFAULT_ZOOM;
-        List<Integer> maxShots = new ArrayList<>();
+        @Getter List<Integer> maxShots = new ArrayList<>();
         String crosshair;
         String crosshairRunning;
         String crosshairZoomed;
@@ -149,7 +150,7 @@ public static class Builder {
         long pumpTimeoutMilliseconds;
         long burstTimeoutMilliseconds = Weapon.DEFAULT_BURST_TIMEOUT_MILLISECONDS;
 
-        private float inaccuracy = DEFAULT_INACCURACY;
+        @Getter private float inaccuracy = DEFAULT_INACCURACY;
 
         int pellets = 1;
 
@@ -222,7 +223,7 @@ public static class Builder {
 
         private boolean newSys = false;
 
-        private int[][] guiPositions = new int[][]{{-43, 86}, {97, 96}, {92, 34}, {14, -55}, {164, -26}, {145, 67}, {60, 110}, {0, -50}, {-100, -50}, {-29, 44}, {50, 100}};
+        @Getter private int[][] guiPositions = new int[][]{{-43, 86}, {97, 96}, {92, 34}, {14, -55}, {164, -26}, {145, 67}, {60, 110}, {0, -50}, {-100, -50}, {-29, 44}, {50, 100}};
 
 
         public Builder() {
@@ -256,22 +257,10 @@ public Builder hasGUIPositions(int[][] gp) {
             return this;
         }
 
-        public List<Integer> getMaxShots() {
-            return this.maxShots;
-        }
-
-        public int[][] getGUIPositions() {
-            return this.guiPositions;
-        }
-
         public float getFirerate() {
             return this.fireRate;
         }
 
-        public float getInaccuracy() {
-            return this.inaccuracy;
-        }
-
         public Builder hasFlashPedals() {
             this.hasFlashPedals = true;
             return this;
@@ -1022,24 +1011,24 @@ public Weapon build(ModContext modContext) {
 
     public Builder builder;
 
-    private final ModContext modContext;
+    @Getter private final ModContext modContext;
 
-    private Vec3d muzzlePosition;
+    @Getter private Vec3d muzzlePosition;
 
     private CraftingEntry[] modernRecipe;
 
-    private SoundEvent shootSound;
-    private SoundEvent endOfShootSound;
-    private SoundEvent silencedShootSound;
-    private SoundEvent reloadSound;
-    private SoundEvent reloadIterationSound;
-    private SoundEvent inspectSound;
-    private SoundEvent drawSound;
-    private SoundEvent allReloadIterationsCompletedSound;
-    private SoundEvent unloadSound;
-    private SoundEvent ejectSpentRoundSound;
-    private SoundEvent burstShootSound;
-    private SoundEvent silencedBurstShootSound;
+    @Getter private SoundEvent shootSound;
+    @Getter private SoundEvent endOfShootSound;
+    @Getter private SoundEvent silencedShootSound;
+    @Getter private SoundEvent reloadSound;
+    @Getter private SoundEvent reloadIterationSound;
+    @Getter private SoundEvent inspectSound;
+    @Getter private SoundEvent drawSound;
+    @Getter private SoundEvent allReloadIterationsCompletedSound;
+    @Getter private SoundEvent unloadSound;
+    @Getter private SoundEvent ejectSpentRoundSound;
+    @Getter private SoundEvent burstShootSound;
+    @Getter private SoundEvent silencedBurstShootSound;
 
     public enum State {READY, SHOOTING, RELOAD_REQUESTED, RELOAD_CONFIRMED, UNLOAD_STARTED, UNLOAD_REQUESTED_FROM_SERVER, UNLOAD_CONFIRMED, PAUSED, MODIFYING, EJECT_SPENT_ROUND}
 
@@ -1071,59 +1060,6 @@ public CraftingEntry[] getModernRecipe() {
     }
 
 
-    public SoundEvent getShootSound() {
-        return shootSound;
-    }
-
-    public SoundEvent getBurstShootSound() {
-        return burstShootSound;
-    }
-
-    public SoundEvent getSilencedBurstShootSound() {
-        return silencedBurstShootSound;
-    }
-
-    public SoundEvent getEndOfShootSound() {
-        return endOfShootSound;
-    }
-
-    public SoundEvent getSilencedShootSound() {
-        return silencedShootSound;
-    }
-
-    public SoundEvent getReloadSound() {
-        return reloadSound;
-    }
-
-
-    public SoundEvent getReloadIterationSound() {
-        return reloadIterationSound;
-    }
-
-    public SoundEvent getInspectSound() {
-        return inspectSound;
-    }
-
-    public SoundEvent getDrawSound() {
-        return drawSound;
-    }
-
-    public SoundEvent getAllReloadIterationsCompletedSound() {
-        return allReloadIterationsCompletedSound;
-    }
-
-    public SoundEvent getUnloadSound() {
-        return unloadSound;
-    }
-
-    public SoundEvent getEjectSpentRoundSound() {
-        return ejectSpentRoundSound;
-    }
-
-    public Vec3d getMuzzlePosition() {
-        return this.muzzlePosition;
-    }
-
     @Override
     public boolean onEntitySwing(EntityLivingBase entityLiving, ItemStack itemStack) {
         return true;
@@ -1601,10 +1537,6 @@ public float getRecoil() {
         return BalancePackManager.shouldChangeWeaponRecoil(this) ? (float) BalancePackManager.getNewWeaponRecoil(this) : builder.recoil;
     }
 
-    public ModContext getModContext() {
-        return modContext;
-    }
-
     public float getShellCasingVerticalOffset() {
         return builder.shellCasingVerticalOffset;
     }
diff --git a/src/main/java/com/paneedah/weaponlib/WeaponRenderer.java b/src/main/java/com/paneedah/weaponlib/WeaponRenderer.java
index 432ea96ca..2398464c4 100644
--- a/src/main/java/com/paneedah/weaponlib/WeaponRenderer.java
+++ b/src/main/java/com/paneedah/weaponlib/WeaponRenderer.java
@@ -17,6 +17,8 @@
 import com.paneedah.weaponlib.config.ModernConfigManager;
 import com.paneedah.weaponlib.render.*;
 import com.paneedah.weaponlib.shader.jim.Shader;
+import lombok.Getter;
+import lombok.Setter;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.entity.AbstractClientPlayer;
 import net.minecraft.client.gui.ScaledResolution;
@@ -312,88 +314,15 @@ public static class Builder {
 
         private boolean compoundReloadUsesTactical;
         private boolean compoundReloadEmptyUsesTactical;
-        private boolean hasTacticalReload;
-
-        public boolean isHasTacticalReload() {
-            return hasTacticalReload;
-        }
-
-        public void setHasTacticalReload(boolean hasTacticalReload) {
-            this.hasTacticalReload = hasTacticalReload;
-        }
-
-        public boolean isHasUnloadEmpty() {
-            return hasUnloadEmpty;
-        }
-
-        public void setHasUnloadEmpty(boolean hasUnloadEmpty) {
-            this.hasUnloadEmpty = hasUnloadEmpty;
-        }
-
-        public boolean isHasLoadEmpty() {
-            return hasLoadEmpty;
-        }
-
-        public void setHasLoadEmpty(boolean hasLoadEmpty) {
-            this.hasLoadEmpty = hasLoadEmpty;
-        }
-
-        public boolean isHasCompoundReloadEmpty() {
-            return hasCompoundReloadEmpty;
-        }
-
-        public void setHasCompoundReloadEmpty(boolean hasCompoundReloadEmpty) {
-            this.hasCompoundReloadEmpty = hasCompoundReloadEmpty;
-        }
-
-        public boolean isHasCompoundReload() {
-            return hasCompoundReload;
-        }
-
-        public void setHasCompoundReload(boolean hasCompoundReload) {
-            this.hasCompoundReload = hasCompoundReload;
-        }
-
-        public boolean isHasLoad() {
-            return hasLoad;
-        }
-
-        public void setHasLoad(boolean hasLoad) {
-            this.hasLoad = hasLoad;
-        }
-
-        public boolean isHasUnload() {
-            return hasUnload;
-        }
-
-        public void setHasUnload(boolean hasUnload) {
-            this.hasUnload = hasUnload;
-        }
-
-        public boolean isHasDraw() {
-            return hasDraw;
-        }
-
-        public void setHasDraw(boolean hasDraw) {
-            this.hasDraw = hasDraw;
-        }
-
-        public boolean isHasInspect() {
-            return hasInspect;
-        }
-
-        public void setHasInspect(boolean hasInspect) {
-            this.hasInspect = hasInspect;
-        }
-
-        private boolean hasUnloadEmpty;
-        private boolean hasLoadEmpty;
-        private boolean hasCompoundReloadEmpty;
-        private boolean hasCompoundReload;
-        private boolean hasLoad;
-        private boolean hasUnload;
-        private boolean hasDraw;
-        private boolean hasInspect;
+        @Setter @Getter private boolean hasTacticalReload;
+        @Setter @Getter private boolean hasUnloadEmpty;
+        @Setter @Getter private boolean hasLoadEmpty;
+        @Setter @Getter private boolean hasCompoundReloadEmpty;
+        @Setter @Getter private boolean hasCompoundReload;
+        @Setter @Getter private boolean hasLoad;
+        @Setter @Getter private boolean hasUnload;
+        @Setter @Getter private boolean hasDraw;
+        @Setter @Getter private boolean hasInspect;
         private boolean hasEjectSpentRound;
         private boolean hasEjectSpentRoundAimed;
 
@@ -1243,7 +1172,7 @@ public Builder setupModernAnimations(String animationFile, ItemAttachment<Weapon
             SingleAnimation compound = set.getSingleAnimation(BBLoader.KEY_COMPOUND_RELOAD);
             if (compound != null) {
                 if (compound.hasBone(BBLoader.KEY_MAGIC_MAGAZINE)) {
-                    if (compound.getBone(BBLoader.KEY_MAGIC_MAGAZINE).bbTransition.size() > 1) {
+                    if (compound.getBone(BBLoader.KEY_MAGIC_MAGAZINE).getBbTransition().size() > 1) {
                         compoundReloadUsesTactical = true;
                     }
                 }
@@ -1252,7 +1181,7 @@ public Builder setupModernAnimations(String animationFile, ItemAttachment<Weapon
             SingleAnimation compoundEmpty = set.getSingleAnimation(BBLoader.KEY_COMPOUND_RELOAD_EMPTY);
             if (compoundEmpty != null) {
                 if (compoundEmpty.hasBone(BBLoader.KEY_MAGIC_MAGAZINE)) {
-                    if (compoundEmpty.getBone(BBLoader.KEY_MAGIC_MAGAZINE).bbTransition.size() > 1) {
+                    if (compoundEmpty.getBone(BBLoader.KEY_MAGIC_MAGAZINE).getBbTransition().size() > 1) {
                         compoundReloadEmptyUsesTactical = true;
                     }
                 }
@@ -2737,7 +2666,7 @@ private List<MultipartTransition<Part, RenderContext<RenderableState>>> getCompl
                     .withPartPositionFunction(Part.RIGHT_HAND, createWeaponPartPositionFunction(r));
 
 
-            t.sound = p.getSound();
+            t.sound = p.getSoundEvent();
 
 
             for (Entry<Part, List<Transition<RenderContext<RenderableState>>>> e : custom.entrySet()) {
diff --git a/src/main/java/com/paneedah/weaponlib/WeaponResourcePack.java b/src/main/java/com/paneedah/weaponlib/WeaponResourcePack.java
index 81a20ffa2..62a466346 100644
--- a/src/main/java/com/paneedah/weaponlib/WeaponResourcePack.java
+++ b/src/main/java/com/paneedah/weaponlib/WeaponResourcePack.java
@@ -39,9 +39,8 @@ private String modifyResourcePath(ResourceLocation resourceLocation) {
     @Override
     public boolean resourceExists(ResourceLocation resourceLocation) {
         String resourcePath = modifyResourcePath(resourceLocation);
-        boolean value = WEAPONLIB_RESOURCE_DOMAIN.equals(resourceLocation.getNamespace())
+        return WEAPONLIB_RESOURCE_DOMAIN.equals(resourceLocation.getNamespace())
                 && getClass().getResource(resourcePath) != null;
-        return value;
     }
 
 
diff --git a/src/main/java/com/paneedah/weaponlib/animation/AnimationModeProcessor.java b/src/main/java/com/paneedah/weaponlib/animation/AnimationModeProcessor.java
index 8f74e04ac..e50e73ec8 100644
--- a/src/main/java/com/paneedah/weaponlib/animation/AnimationModeProcessor.java
+++ b/src/main/java/com/paneedah/weaponlib/animation/AnimationModeProcessor.java
@@ -5,6 +5,8 @@
 import com.paneedah.weaponlib.animation.gui.AnimationGUI;
 import com.paneedah.weaponlib.debug.DebugRenderer;
 import com.paneedah.weaponlib.render.Shaders;
+import lombok.Getter;
+import lombok.Setter;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.client.renderer.GlStateManager;
@@ -37,12 +39,12 @@ public class AnimationModeProcessor {
 
 
     private final HashMap<AttachmentCategory, Boolean> shouldRender = new HashMap<>();
-    private AttachmentCategory activeCategory;
+    @Setter private AttachmentCategory activeCategory;
     private AttachmentCategory exclusionCategory;
 
-    private static final AnimationModeProcessor instance = new AnimationModeProcessor();
+    @Getter private static final AnimationModeProcessor instance = new AnimationModeProcessor();
 
-    public boolean legacyMode = false;
+    @Getter public boolean legacyMode = false;
 
     public Vec3d pan = Vec3d.ZERO;
 
@@ -69,10 +71,6 @@ public AttachmentCategory getExcludedCategory() {
         return this.exclusionCategory;
     }
 
-    public void setActiveCategory(AttachmentCategory category) {
-        this.activeCategory = category;
-    }
-
     public boolean shouldIsolateCategory() {
         return this.activeCategory != null;
     }
@@ -106,14 +104,6 @@ public void setFPSMode(boolean state) {
         this.fpsMode = state;
     }
 
-    public static AnimationModeProcessor getInstance() {
-        return instance;
-    }
-
-    public boolean isLegacyMode() {
-        return this.legacyMode;
-    }
-
     public void captureDeferral() {
         deferredMatrix.rewind();
         GL11.glGetFloat(GL11.GL_MODELVIEW_MATRIX, deferredMatrix);
diff --git a/src/main/java/com/paneedah/weaponlib/animation/DebugPositioner.java b/src/main/java/com/paneedah/weaponlib/animation/DebugPositioner.java
index d1ea74678..60f49c3f7 100644
--- a/src/main/java/com/paneedah/weaponlib/animation/DebugPositioner.java
+++ b/src/main/java/com/paneedah/weaponlib/animation/DebugPositioner.java
@@ -2,6 +2,8 @@
 
 import com.paneedah.weaponlib.KeyBindings;
 import com.paneedah.weaponlib.tracking.LivingEntityTracker;
+import lombok.Getter;
+import lombok.Setter;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.text.TextComponentString;
 import org.lwjgl.opengl.GL11;
@@ -25,24 +27,14 @@ public class DebugPositioner {
 
     private static final Set<Object> debugParts = new HashSet<>();
 
-    private static Entity watchableEntity;
+    @Getter private static Entity watchableEntity;
 
-    private static boolean isAdjustRotationMode;
-
-    public static void setAdjustRotPoint(boolean status) {
-        isAdjustRotationMode = status;
-    }
+    @Setter private static boolean isAdjustRotationMode;
 
+    @Setter @Getter
     public static final class TransitionConfiguration {
         private long pause;
 
-        public long getPause() {
-            return pause;
-        }
-
-        public void setPause(long pause) {
-            this.pause = pause;
-        }
     }
 
     public static class Position {
@@ -399,10 +391,6 @@ public static void watch() {
         System.out.println("Trackable entities: " + tracker.getTrackableEntitites());
     }
 
-    public static Entity getWatchableEntity() {
-        return watchableEntity;
-    }
-
     public static void showCurrentMatrix(String message) {
         showCurrentMatrix(null, message);
     }
diff --git a/src/main/java/com/paneedah/weaponlib/animation/Interpolation.java b/src/main/java/com/paneedah/weaponlib/animation/Interpolation.java
index 09e2067e1..ac550272b 100644
--- a/src/main/java/com/paneedah/weaponlib/animation/Interpolation.java
+++ b/src/main/java/com/paneedah/weaponlib/animation/Interpolation.java
@@ -11,14 +11,13 @@ public enum Interpolation {
 
     public double interpolate(double input) {
         switch (this) {
-            case LINEAR:
-                return input;
             case ACCELERATION:
                 return input * input;
             case DECELERATION:
                 return 1 - ((1 - input) * (1 - input));
             case SMOOTHSTEP:
                 return input * input * (3 - (2 * input));
+            case LINEAR:
             default:
                 return input;
         }
diff --git a/src/main/java/com/paneedah/weaponlib/animation/ModernAnimator.java b/src/main/java/com/paneedah/weaponlib/animation/ModernAnimator.java
deleted file mode 100644
index efa8b941c..000000000
--- a/src/main/java/com/paneedah/weaponlib/animation/ModernAnimator.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.paneedah.weaponlib.animation;
-
-import com.paneedah.weaponlib.animation.jim.AnimationData;
-
-public class ModernAnimator {
-
-
-    public static ModernAnimator instance = new ModernAnimator();
-
-    public static ModernAnimator getInstance() {
-        return instance;
-    }
-
-    public void position(AnimationData data) {
-
-    }
-
-}
diff --git a/src/main/java/com/paneedah/weaponlib/animation/MultipartTransition.java b/src/main/java/com/paneedah/weaponlib/animation/MultipartTransition.java
index fcfa01400..c680b06b9 100644
--- a/src/main/java/com/paneedah/weaponlib/animation/MultipartTransition.java
+++ b/src/main/java/com/paneedah/weaponlib/animation/MultipartTransition.java
@@ -1,5 +1,6 @@
 package com.paneedah.weaponlib.animation;
 
+import lombok.Getter;
 import net.minecraft.util.SoundEvent;
 import net.minecraft.util.math.Vec3d;
 
@@ -16,12 +17,12 @@ public static <Context> Consumer<Context> anchoredPosition() {
         return (Consumer<Context>) DEFAULT_POSITION;
     }
 
-    public Context cont;
+    @Getter public Context context;
 
     private final Map<Part, Consumer<Context>> multipartPositionFunctions = new HashMap<>();
     private final Map<Part, Part> attachedTo = new HashMap<>();
-    private final long duration;
-    private final long pause;
+    @Getter private final long duration;
+    @Getter private final long pause;
 
     public SoundEvent sound;
 
@@ -91,18 +92,6 @@ public Consumer<Context> getPositioning(Part part) {
         return multipartPositionFunctions.get(part);
     }
 
-    public Context getContext() {
-        return this.cont;
-    }
-
-    public long getDuration() {
-        return duration;
-    }
-
-    public long getPause() {
-        return pause;
-    }
-
     public Part getAttachedTo(Part part) {
         return attachedTo.get(part);
     }
diff --git a/src/main/java/com/paneedah/weaponlib/animation/OpenGLSelectionHelper.java b/src/main/java/com/paneedah/weaponlib/animation/OpenGLSelectionHelper.java
index bbb357f83..951ffbdab 100644
--- a/src/main/java/com/paneedah/weaponlib/animation/OpenGLSelectionHelper.java
+++ b/src/main/java/com/paneedah/weaponlib/animation/OpenGLSelectionHelper.java
@@ -32,19 +32,13 @@ public class OpenGLSelectionHelper {
 
     public static Framebuffer ballBuf;
 
-    public static boolean mouseClick = false;
-
     /**
      * Allows you to select obj behind
      *
-     * @return
+     * @return true
      */
     public static boolean shouldRender(int id) {
-        return true;
-    }
-
-    public static void setupSelectionBuffer() {
-
+        return true; //TODO This always returns true
     }
 
     public static void bindBallBuf() {
diff --git a/src/main/java/com/paneedah/weaponlib/animation/Transition.java b/src/main/java/com/paneedah/weaponlib/animation/Transition.java
index c6d22e52b..80743e2ce 100644
--- a/src/main/java/com/paneedah/weaponlib/animation/Transition.java
+++ b/src/main/java/com/paneedah/weaponlib/animation/Transition.java
@@ -1,6 +1,8 @@
 package com.paneedah.weaponlib.animation;
 
 import com.paneedah.weaponlib.Part;
+import lombok.Getter;
+import lombok.Setter;
 import net.minecraft.util.SoundEvent;
 
 import java.util.function.Consumer;
@@ -14,13 +16,12 @@ public static <T> Consumer<T> anchoredPosition() {
         return (Consumer<T>) ANCHORED_POSITION;
     }
 
-    private final Consumer<Context> itemPositioning;
-    private long duration;
-    private final long pause;
-    private final Part attachedTo;
-    private boolean animated;
-
-    private SoundEvent evt;
+    @Getter private final Consumer<Context> itemPositioning;
+    @Getter @Setter private long duration;
+    @Getter private final long pause;
+    @Getter private final Part attachedTo;
+    @Getter private boolean animated;
+    @Getter @Setter private SoundEvent soundEvent;
 
     public Transition(Consumer<Context> itemPositioning, Part attachedTo, boolean animated) {
         this(itemPositioning, 0, 0);
@@ -35,42 +36,10 @@ public Transition(Consumer<Context> itemPositioning, long duration, long pause)
         this(itemPositioning, duration, pause, null);
     }
 
-    public void setSound(SoundEvent event) {
-        this.evt = event;
-    }
-
     public Transition(Consumer<Context> itemPositioning, long duration, long pause, Part attachedTo) {
         this.itemPositioning = itemPositioning;
         this.duration = duration;
         this.pause = pause;
         this.attachedTo = attachedTo;
     }
-
-    public Consumer<Context> getItemPositioning() {
-        return itemPositioning;
-    }
-
-    public void setDuration(long newDuration) {
-        this.duration = newDuration;
-    }
-
-    public long getDuration() {
-        return duration;
-    }
-
-    public SoundEvent getSound() {
-        return this.evt;
-    }
-
-    public long getPause() {
-        return pause;
-    }
-
-    public Part getAttachedTo() {
-        return attachedTo;
-    }
-
-    public boolean isAnimated() {
-        return animated;
-    }
 }
diff --git a/src/main/java/com/paneedah/weaponlib/animation/gui/AnimGUIRenderable.java b/src/main/java/com/paneedah/weaponlib/animation/gui/AnimGUIRenderable.java
deleted file mode 100644
index 6af272d79..000000000
--- a/src/main/java/com/paneedah/weaponlib/animation/gui/AnimGUIRenderable.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.paneedah.weaponlib.animation.gui;
-
-public abstract class AnimGUIRenderable {
-
-    public abstract void render(int mouseX, int mouseY);
-
-}
diff --git a/src/main/java/com/paneedah/weaponlib/animation/gui/AnimationGUI.java b/src/main/java/com/paneedah/weaponlib/animation/gui/AnimationGUI.java
index 4f842f336..6a689eb36 100644
--- a/src/main/java/com/paneedah/weaponlib/animation/gui/AnimationGUI.java
+++ b/src/main/java/com/paneedah/weaponlib/animation/gui/AnimationGUI.java
@@ -8,6 +8,7 @@
 import com.paneedah.weaponlib.animation.DebugPositioner.Position;
 import com.paneedah.weaponlib.animation.OpenGLSelectionHelper;
 import com.paneedah.weaponlib.compatibility.RecoilParam;
+import lombok.Getter;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.AbstractClientPlayer;
 import net.minecraft.client.gui.ScaledResolution;
@@ -35,7 +36,7 @@
 
 public class AnimationGUI {
 
-    private static final AnimationGUI instance = new AnimationGUI();
+    @Getter private static final AnimationGUI instance = new AnimationGUI();
 
     public ArrayList<Panel> panels = new ArrayList<>();
 
@@ -76,11 +77,6 @@ public class AnimationGUI {
     public Slider debugFireRate = new Slider("Debug Fire Rate", false, 1, 25);
 
 
-    public static AnimationGUI getInstance() {
-        //instance = new AnimationGUI();
-        return instance;
-    }
-
     public boolean isPanelClosed(String name) {
         for (Panel panel : this.panels) {
             if (panel.getTitle().equals(name)) {
@@ -107,7 +103,6 @@ public RecoilParam getRecoilParams() {
     }
 
     public AnimationGUI() {
-
         Panel cameraPanel = new Panel(this, "Functionality", 10, 10, 20);
 
         // cam reset 0
@@ -191,8 +186,6 @@ public void render() {
     public Textbar rotation = new Textbar("Rotation", 10, 75, 90, 15);
 
     public void extraRender() {
-
-
         ScaledResolution sr = new ScaledResolution(MC);
         position.x = (int) (sr.getScaledWidth_double() - 100);
         rotation.x = (int) (sr.getScaledWidth_double() - 100);
diff --git a/src/main/java/com/paneedah/weaponlib/animation/gui/Button.java b/src/main/java/com/paneedah/weaponlib/animation/gui/Button.java
index d89df7370..04cb8b328 100644
--- a/src/main/java/com/paneedah/weaponlib/animation/gui/Button.java
+++ b/src/main/java/com/paneedah/weaponlib/animation/gui/Button.java
@@ -1,9 +1,12 @@
 package com.paneedah.weaponlib.animation.gui;
 
+import lombok.Getter;
+import lombok.Setter;
 import net.minecraft.client.renderer.GlStateManager;
 
 import java.awt.*;
 
+@Getter @Setter
 public class Button {
 
     public double x, y;
@@ -69,54 +72,6 @@ public boolean isMouseOver(int mouseX, int mouseY) {
 
     }
 
-    public double getX() {
-        return x;
-    }
-
-    public void setX(int x) {
-        this.x = x;
-    }
-
-    public double getY() {
-        return y;
-    }
-
-    public void setY(int y) {
-        this.y = y;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public int getSize() {
-        return size;
-    }
-
-    public void setSize(int size) {
-        this.size = size;
-    }
-
-    public boolean isState() {
-        return state;
-    }
-
-    public void setState(boolean state) {
-        this.state = state;
-    }
-
-    public boolean isToggle() {
-        return isToggle;
-    }
-
-    public void setToggle(boolean isToggle) {
-        this.isToggle = isToggle;
-    }
-
     public void onMouseClick() {
 
         if (isToggle) {
diff --git a/src/main/java/com/paneedah/weaponlib/animation/gui/Panel.java b/src/main/java/com/paneedah/weaponlib/animation/gui/Panel.java
index 1256da38d..f7230dcb1 100644
--- a/src/main/java/com/paneedah/weaponlib/animation/gui/Panel.java
+++ b/src/main/java/com/paneedah/weaponlib/animation/gui/Panel.java
@@ -2,11 +2,14 @@
 
 import com.paneedah.weaponlib.animation.AnimationModeProcessor;
 import io.redstudioragnarok.redcore.vectors.Vector2D;
+import lombok.Getter;
+import lombok.Setter;
 import net.minecraft.client.renderer.GlStateManager;
 
 import java.awt.*;
 import java.util.ArrayList;
 
+@Getter @Setter
 public class Panel {
 
 
@@ -40,14 +43,6 @@ public Panel(AnimationGUI gui, String title, double x, double y, double buttonSi
         this.buttonSize = buttonSize;
     }
 
-    public boolean isClosed() {
-        return this.closed;
-    }
-
-    public void setClosed(boolean bool) {
-        this.closed = bool;
-    }
-
 
     public void handleButtonClicks(int mouseX, int mouseY) {
 
@@ -184,111 +179,12 @@ public void render(int mouseX, int mouseY) {
     }
 
 
-    public String getTitle() {
-        return this.title;
-    }
-
-    public ArrayList<Button> getButtonList() {
-        return buttonList;
-    }
-
-
-    public void setButtonList(ArrayList<Button> buttonList) {
-        this.buttonList = buttonList;
-    }
-
-
-    public AnimationGUI getGui() {
-        return gui;
-    }
-
-
-    public void setGui(AnimationGUI gui) {
-        this.gui = gui;
-    }
-
-
-    public double getPositionX() {
-        return positionX;
-    }
-
-
-    public void setPositionX(double positionX) {
-        this.positionX = positionX;
-    }
-
-
-    public double getPositionY() {
-        return positionY;
-    }
-
-
-    public void setPositionY(double positionY) {
-        this.positionY = positionY;
-    }
-
-
-    public double getWidth() {
-        return width;
-    }
-
-
-    public void setWidth(double width) {
-        this.width = width;
-    }
-
-
-    public double getHeight() {
-        return height;
-    }
-
-
     public void setHeight(double height) {
         actualHeight = height;
         this.height = height;
     }
 
 
-    public double getButtonSize() {
-        return buttonSize;
-    }
-
-
-    public void setButtonSize(double buttonSize) {
-        this.buttonSize = buttonSize;
-    }
-
-
-    public boolean isGrabbed() {
-        return grabbed;
-    }
-
-
-    public void setGrabbed(boolean grabbed) {
-        this.grabbed = grabbed;
-    }
-
-
-    public Vector2D getOriginalMouseCoords() {
-        return originalMouseCoords;
-    }
-
-
-    public void setOriginalMouseCoords(Vector2D originalMouseCoords) {
-        this.originalMouseCoords = originalMouseCoords;
-    }
-
-
-    public Vector2D getOriginalPanelCoords() {
-        return originalPanelCoords;
-    }
-
-
-    public void setOriginalPanelCoords(Vector2D originalPanelCoords) {
-        this.originalPanelCoords = originalPanelCoords;
-    }
-
-
     public static int getBuffer() {
         return BUFFER;
     }
diff --git a/src/main/java/com/paneedah/weaponlib/animation/gui/Slider.java b/src/main/java/com/paneedah/weaponlib/animation/gui/Slider.java
index e946fbafe..c765b7c94 100644
--- a/src/main/java/com/paneedah/weaponlib/animation/gui/Slider.java
+++ b/src/main/java/com/paneedah/weaponlib/animation/gui/Slider.java
@@ -1,6 +1,8 @@
 package com.paneedah.weaponlib.animation.gui;
 
 import com.paneedah.weaponlib.animation.MatrixHelper;
+import lombok.Getter;
+import lombok.Setter;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.text.TextFormatting;
@@ -17,7 +19,8 @@ public class Slider implements IElement {
     private final double mapStart;
     private final double mapEnd;
     private final boolean centered;
-    private double progress;
+
+    @Getter @Setter private double progress;
 
     private double verticalOffset = 0;
 
@@ -119,19 +122,11 @@ public double getValue() {
         return MatrixHelper.solveLerp(mapStart, mapEnd, progress);
     }
 
-    public void setProgress(double progress) {
-        this.progress = progress;
-    }
-
     public void setValue(double value) {
         this.progress = value / (mapEnd - mapStart);
 
     }
 
-    public double getProgress() {
-        return this.progress;
-    }
-
     @Override
     public boolean cancelGrab(int mouseX, int mouseY) {
         return hovered || grabbingSlider;
diff --git a/src/main/java/com/paneedah/weaponlib/animation/gui/Textbar.java b/src/main/java/com/paneedah/weaponlib/animation/gui/Textbar.java
index d3e53d235..9e7d57697 100644
--- a/src/main/java/com/paneedah/weaponlib/animation/gui/Textbar.java
+++ b/src/main/java/com/paneedah/weaponlib/animation/gui/Textbar.java
@@ -12,11 +12,7 @@
 
 public class Textbar {
 
-    public int x = 0;
-    public int y = 0;
-
-    public int w = 0;
-    public int h = 0;
+    public int x, y, w, h;
 
     public String[] strings = new String[3];
 
diff --git a/src/main/java/com/paneedah/weaponlib/animation/jim/AnimationData.java b/src/main/java/com/paneedah/weaponlib/animation/jim/AnimationData.java
index 7c509e6ff..700558e8f 100644
--- a/src/main/java/com/paneedah/weaponlib/animation/jim/AnimationData.java
+++ b/src/main/java/com/paneedah/weaponlib/animation/jim/AnimationData.java
@@ -12,6 +12,8 @@
 import com.paneedah.weaponlib.animation.Transition;
 import com.paneedah.weaponlib.render.bgl.math.AngleKit.EulerAngle;
 import com.paneedah.weaponlib.render.bgl.math.AngleKit.Format;
+import lombok.Getter;
+import lombok.Setter;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.SoundEvent;
 import net.minecraft.util.math.Vec3d;
@@ -22,11 +24,11 @@
 
 public class AnimationData {
 
-    public TreeMap<Float, BlockbenchTransition> bbTransition = new TreeMap<>();
+    @Getter @Setter private TreeMap<Float, BlockbenchTransition> bbTransition = new TreeMap<>();
 
     public static final float PACE = 833f;
 
-    public ArrayList<Float> timestamps = new ArrayList<>();
+    @Getter @Setter private ArrayList<Float> timestamps = new ArrayList<>();
 
     public TreeMap<Float, Vec3d> rotationKeyframes = new TreeMap<>();
     public TreeMap<Float, Vec3d> translateKeyframes = new TreeMap<>();
@@ -37,7 +39,7 @@ public class AnimationData {
 
 
     // The **ACTUAL** duration of the animation as designated in the BlockBench file
-    private float appointedDuration;
+    @Getter @Setter private float appointedDuration;
 
 
     protected AnimationData(ArrayList<Float> arrayList) {
@@ -46,14 +48,6 @@ protected AnimationData(ArrayList<Float> arrayList) {
         this.fTLength = (long) (arrayList.get(arrayList.size() - 1) / arrayList.size());
     }
 
-    public void setAppointedDuration(float f) {
-        this.appointedDuration = f;
-    }
-
-    public float getAppointedDuration() {
-        return this.appointedDuration;
-    }
-
     public AnimationData(JsonObject obj) {
 
         // initialize a timestamp array and the key arrays
@@ -205,7 +199,7 @@ public void setSounds(HashMap<Float, String> map, ArrayList<Float> overflowList)
         for (Entry<Float, BlockbenchTransition> set : this.bbTransition.entrySet()) {
             if (map.containsKey(set.getKey())) {
                 overflowList.remove(set.getKey());
-                set.getValue().setSound(UniversalSoundLookup.lookupSound(map.get(set.getKey())));
+                set.getValue().setSoundEvent(UniversalSoundLookup.lookupSound(map.get(set.getKey())));
             }
         }
     }
@@ -464,10 +458,10 @@ public List<Transition<RenderContext<RenderableState>>> getTransitionList(Transf
 
     public static class BlockbenchTransition {
 
-        private float timestamp;
-        private Vec3d rotation;
-        private Vec3d translation;
-        private SoundEvent sound;
+        @Getter @Setter private float timestamp;
+        @Getter @Setter private Vec3d rotation;
+        @Getter @Setter private Vec3d translation;
+        @Getter @Setter private SoundEvent soundEvent;
 
         public BlockbenchTransition(float timestamp, Vec3d rotation, Vec3d translation) {
             this.timestamp = timestamp;
@@ -475,10 +469,6 @@ public BlockbenchTransition(float timestamp, Vec3d rotation, Vec3d translation)
             this.translation = translation;
         }
 
-        public void setSound(SoundEvent sound) {
-            this.sound = sound;
-        }
-
         public void directTransform() {
             GL11.glTranslated(translation.x / 25f, translation.y / 25f, translation.z / 25f);
 
@@ -521,9 +511,6 @@ public Transition<?> createVMWTransitionWithADS(Transform normal, Transform ads,
                  */
 
 
-                Transform t = normal;
-
-
                 double rotXMult = 1.0;
                 double rotYMult = 1.0;
                 double rotZMult = 1.0;
@@ -548,31 +535,31 @@ public Transition<?> createVMWTransitionWithADS(Transform normal, Transform ads,
                 double mul = 1 / tesla;
 
                 // Original object positioning
-                GlStateManager.translate(t.getPositionX(), t.getPositionY(), t.getPositionZ());
+                GlStateManager.translate(normal.getPositionX(), normal.getPositionY(), normal.getPositionZ());
 
                 // Animation translation
                 GL11.glTranslated(translation.x * mul, -translation.y * mul, translation.z * mul);
 
                 // Offset rotation point
-                GlStateManager.translate(t.getRotationPointX(), t.getRotationPointY(), t.getRotationPointZ());
+                GlStateManager.translate(normal.getRotationPointX(), normal.getRotationPointY(), normal.getRotationPointZ());
 
                 // Original object rotation (+Z, -Y, -X)
-                GL11.glRotated(t.getRotationZ(), 0, 0, 1);
+                GL11.glRotated(normal.getRotationZ(), 0, 0, 1);
                 GL11.glRotated(rotation.z * rotZMult, 0, 0, 1);
 
-                GL11.glRotated(t.getRotationY(), 0, 1, 0);
+                GL11.glRotated(normal.getRotationY(), 0, 1, 0);
                 GL11.glRotated(rotation.y * rotYMult, 0, 1, 0);
 
-                GL11.glRotated(t.getRotationX(), 1, 0, 0);
+                GL11.glRotated(normal.getRotationX(), 1, 0, 0);
                 GL11.glRotated(rotation.x * rotXMult, 1, 0, 0);
 
-                GlStateManager.translate(-t.getRotationPointX(), -t.getRotationPointY(), -t.getRotationPointZ());
-                GlStateManager.scale(t.getScaleX(), t.getScaleY(), t.getScaleZ());
+                GlStateManager.translate(-normal.getRotationPointX(), -normal.getRotationPointY(), -normal.getRotationPointZ());
+                GlStateManager.scale(normal.getScaleX(), normal.getScaleY(), normal.getScaleZ());
 
 
             }, (int) timestamp);
-            //	System.out.println("Hello?! Brother! " + sound);
-            trans.setSound(sound);
+            //	System.out.println("Hello?! Brother! " + soundEvent);
+            trans.setSoundEvent(soundEvent);
 
             return trans;
 
@@ -660,8 +647,8 @@ public Transition<?> createVMWTransition(Transform t, double divisor) {
             }, Math.round(timestamp));
 
 
-            //System.out.println("Hello?! Brother! " + sound);
-            trans.setSound(sound);
+            //System.out.println("Hello?! Brother! " + soundEvent);
+            trans.setSoundEvent(soundEvent);
             return trans;
 
         }
@@ -680,46 +667,6 @@ public String toString() {
             return "[(" + this.timestamp + ") " + this.rotation + " > " + this.translation + "]";
         }
 
-        public float getTimestamp() {
-            return timestamp;
-        }
-
-        public void setTimestamp(float timestamp) {
-            this.timestamp = timestamp;
-        }
-
-        public Vec3d getRotation() {
-            return rotation;
-        }
-
-        public void setRotation(Vec3d rotation) {
-            this.rotation = rotation;
-        }
-
-        public Vec3d getTranslation() {
-            return translation;
-        }
-
-        public void setTranslation(Vec3d translation) {
-            this.translation = translation;
-        }
-
-    }
-
-    public TreeMap<Float, BlockbenchTransition> getBbTransition() {
-        return bbTransition;
-    }
-
-    public void setBbTransition(TreeMap<Float, BlockbenchTransition> bbTransition) {
-        this.bbTransition = bbTransition;
-    }
-
-    public ArrayList<Float> getTimestamps() {
-        return timestamps;
-    }
-
-    public void setTimestamps(ArrayList<Float> timestamps) {
-        this.timestamps = timestamps;
     }
 
 }
diff --git a/src/main/java/com/paneedah/weaponlib/animation/jim/AnimationSet.java b/src/main/java/com/paneedah/weaponlib/animation/jim/AnimationSet.java
index 3ada43b42..a9a9419b1 100644
--- a/src/main/java/com/paneedah/weaponlib/animation/jim/AnimationSet.java
+++ b/src/main/java/com/paneedah/weaponlib/animation/jim/AnimationSet.java
@@ -1,16 +1,15 @@
 package com.paneedah.weaponlib.animation.jim;
 
+import lombok.Getter;
+
 import java.util.HashMap;
 
+@Getter
 public class AnimationSet {
 
     private final HashMap<String, SingleAnimation> animations = new HashMap<>();
 
 
-    public HashMap<String, SingleAnimation> getAnimations() {
-        return animations;
-    }
-
     public boolean containsKey(String name) {
         return animations.containsKey(name);
     }
diff --git a/src/main/java/com/paneedah/weaponlib/animation/jim/KeyedAnimation.java b/src/main/java/com/paneedah/weaponlib/animation/jim/KeyedAnimation.java
index d495dc15c..06b314e50 100644
--- a/src/main/java/com/paneedah/weaponlib/animation/jim/KeyedAnimation.java
+++ b/src/main/java/com/paneedah/weaponlib/animation/jim/KeyedAnimation.java
@@ -25,7 +25,7 @@ public KeyedAnimation(float max) {
 
     public KeyedAnimation(AnimationData data) {
         // Copy keys
-        for (Entry<Float, BlockbenchTransition> entry : data.bbTransition.entrySet()) {
+        for (Entry<Float, BlockbenchTransition> entry : data.getBbTransition().entrySet()) {
             bbMap.put(entry.getKey(), entry.getValue());
         }
 
diff --git a/src/main/java/com/paneedah/weaponlib/animation/jim/SingleAnimation.java b/src/main/java/com/paneedah/weaponlib/animation/jim/SingleAnimation.java
index c2b3179b9..79f2f45c3 100644
--- a/src/main/java/com/paneedah/weaponlib/animation/jim/SingleAnimation.java
+++ b/src/main/java/com/paneedah/weaponlib/animation/jim/SingleAnimation.java
@@ -86,12 +86,12 @@ public void bake() {
 
             for (int t = 0; t < getTimestamps().size(); ++t) {
                 if (t == 0) {
-                    data.bbTransition.get(getTimestamps().get(t)).setTimestamp(1.0f);
+                    data.getBbTransition().get(getTimestamps().get(t)).setTimestamp(1.0f);
                 } else {
                     float trueDelta = AnimationData.PACE * (getTimestamps().get(t) - getTimestamps().get(t - 1));
 
                     //System.out.println("(" + getTimestamps().get(t-1) + ") -> (" + getTimestamps().get(t) + ") " + trueDelta);
-                    data.bbTransition.get(getTimestamps().get(t)).setTimestamp(trueDelta);
+                    data.getBbTransition().get(getTimestamps().get(t)).setTimestamp(trueDelta);
                 }
             }
 
diff --git a/src/main/java/com/paneedah/weaponlib/command/DebugCommand.java b/src/main/java/com/paneedah/weaponlib/command/DebugCommand.java
index f608e5157..7e915e856 100644
--- a/src/main/java/com/paneedah/weaponlib/command/DebugCommand.java
+++ b/src/main/java/com/paneedah/weaponlib/command/DebugCommand.java
@@ -9,6 +9,7 @@
 import com.paneedah.weaponlib.render.ModificationGUI;
 import com.paneedah.weaponlib.render.WeaponSpritesheetBuilder;
 import com.paneedah.weaponlib.vehicle.VehiclePart;
+import lombok.Getter;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.item.Item;
@@ -17,8 +18,6 @@
 import net.minecraft.util.text.TextComponentString;
 import net.minecraft.util.text.TextFormatting;
 
-import java.util.ArrayList;
-
 import static com.paneedah.mwc.proxies.ClientProxy.MC;
 import static com.paneedah.mwc.ProjectConstants.ID;
 
@@ -114,8 +113,6 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
         if (args.length > 0) {
             switch (args[0].toLowerCase()) {
                 case DEBUG_ARG_ON:
-                    processDebugModeSubCommand(args);
-                    break;
                 case DEBUG_ARG_OFF:
                     processDebugModeSubCommand(args);
                     break;
@@ -144,8 +141,6 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
                     processAutorotateSubCommand(args);
                     break;
                 case DEBUG_FREECAM:
-                    processFreecamAndMuzzleSubCommands(args);
-                    break;
                 case DEBUG_MUZZLE_POS:
                     processFreecamAndMuzzleSubCommands(args);
                     break;
@@ -166,9 +161,7 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
         }
     }
 
-    public ArrayList<String> compatList = new ArrayList<>();
-
-    private static boolean isInfiniteAmmo;
+    @Getter private static boolean isInfiniteAmmo;
     private static boolean isDebuggingActionPosition;
     private static boolean isWorkingOnScreenShake;
     private static boolean isForceLiveRenderGUI = true;
@@ -184,10 +177,6 @@ public static boolean isWorkingOnScreenShake() {
         return isWorkingOnScreenShake;
     }
 
-    public static boolean isInfiniteAmmo() {
-        return isInfiniteAmmo;
-    }
-
     public static boolean isEditingGUI() {
         return isEditingGUI;
     }
@@ -229,7 +218,7 @@ private void processWeapon(String[] args) {
                 } else if (args[2].equals("set")) {
                     double intensity = Double.parseDouble(args[3]);
                     double lengthModifier = Double.parseDouble(args[4]);
-                    screenShakeParam = new Pair<Double, Double>(intensity, lengthModifier);
+                    screenShakeParam = new Pair<>(intensity, lengthModifier);
                 }
                 break;
             case "buildsheet":
diff --git a/src/main/java/com/paneedah/weaponlib/config/BalancePackManager.java b/src/main/java/com/paneedah/weaponlib/config/BalancePackManager.java
index ef70aee69..d5679dc43 100644
--- a/src/main/java/com/paneedah/weaponlib/config/BalancePackManager.java
+++ b/src/main/java/com/paneedah/weaponlib/config/BalancePackManager.java
@@ -2,6 +2,8 @@
 
 import com.google.gson.*;
 import com.paneedah.weaponlib.Weapon;
+import lombok.Getter;
+import lombok.Setter;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.util.text.TextComponentString;
 import net.minecraft.util.text.TextFormatting;
@@ -80,6 +82,7 @@ public static String getPackManagerVersion() {
         return PACK_MANAGER_VERSION;
     }
 
+    @Getter @Setter
     public static class GunCategoryBalanceConfiguration {
         private GunConfigurationGroup group;
         private double damageMultiplier = 1.0;
@@ -94,38 +97,10 @@ public GunCategoryBalanceConfiguration(GunConfigurationGroup group, double damag
             this.hipFireSpreadMultiplier = hipFireSpread;
         }
 
-        public GunConfigurationGroup getGroup() {
-            return group;
-        }
-
-        public void setGroup(GunConfigurationGroup group) {
-            this.group = group;
-        }
-
-        public double getDamageMultiplier() {
-            return damageMultiplier;
-        }
-
-        public void setDamageMultiplier(double damageMultiplier) {
-            this.damageMultiplier = damageMultiplier;
-        }
-
-        public double getRecoilMultiplier() {
-            return recoilMultiplier;
-        }
-
-        public void setRecoilMultiplier(double recoilMultiplier) {
-            this.recoilMultiplier = recoilMultiplier;
-        }
-
         public double getHipFireSpread() {
             return hipFireSpreadMultiplier;
         }
 
-        public void setHipFireSpread(double hipFireSpread) {
-            this.hipFireSpreadMultiplier = hipFireSpread;
-        }
-
         public JsonObject toJSONObject() {
             JsonObject category = new JsonObject();
             category.addProperty("group", getGroup().toString());
@@ -148,6 +123,7 @@ public static GunCategoryBalanceConfiguration fromJSONObject(JsonObject obj) {
 
     }
 
+    @Getter @Setter
     public static class GunBalanceConfiguration {
         private String weaponName;
         private boolean enabled = true;
@@ -182,10 +158,6 @@ public GunBalanceConfiguration(String weaponName, boolean enabled, double damage
             this.inaccuracy = inaccuracy;
         }
 
-        public String getWeaponName() {
-            return weaponName;
-        }
-
         public void setBurstShots(int shots) {
             if (shots != 0) {
                 fireModeBurstChanged = true;
@@ -218,10 +190,6 @@ public boolean altersFiremodeBurst() {
             return this.fireModeBurstChanged;
         }
 
-        public int getBurstShots() {
-            return burstShots;
-        }
-
         public boolean getFiremodeAuto() {
             return this.autoFireEnabled;
         }
@@ -234,34 +202,6 @@ public boolean wereFiremodePropertiesAltered() {
             return this.fireModePropertiesChanged;
         }
 
-        public void setWeaponName(String weaponName) {
-            this.weaponName = weaponName;
-        }
-
-        public boolean isEnabled() {
-            return enabled;
-        }
-
-        public void setEnabled(boolean enabled) {
-            this.enabled = enabled;
-        }
-
-        public double getDamage() {
-            return damage;
-        }
-
-        public void setDamage(double damage) {
-            this.damage = damage;
-        }
-
-        public double getRecoil() {
-            return recoil;
-        }
-
-        public void setRecoil(double recoil) {
-            this.recoil = recoil;
-        }
-
         public void setFirerate(float firerate) {
             this.fireRate = firerate;
         }
@@ -270,10 +210,6 @@ public double getFirerate() {
             return this.fireRate;
         }
 
-        public void setInaccuracy(float inaccuracy) {
-            this.inaccuracy = inaccuracy;
-        }
-
         public double getInaccuracy() {
             return this.inaccuracy;
         }
@@ -331,6 +267,7 @@ public static GunBalanceConfiguration fromJSONObject(JsonObject obj) {
         }
     }
 
+    @Getter @Setter
     public static class BalancePack {
         private String name;
         private String version;
@@ -455,63 +392,6 @@ public JsonObject toJSONObject() {
 
         }
 
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public String getVersion() {
-            return version;
-        }
-
-        public void setVersion(String version) {
-            this.version = version;
-        }
-
-        public double getGlobalRecoilMultiplier() {
-            return globalRecoilMultiplier;
-        }
-
-        public void setGlobalRecoilMultiplier(double globalRecoilMultiplier) {
-            this.globalRecoilMultiplier = globalRecoilMultiplier;
-        }
-
-        public double getGlobalDamageMultiplier() {
-            return globalDamageMultiplier;
-        }
-
-        public void setGlobalDamageMultiplier(double globalDamageMultiplier) {
-            this.globalDamageMultiplier = globalDamageMultiplier;
-        }
-
-        public double getGlobalHipFireSpread() {
-            return globalHipFireSpread;
-        }
-
-        public void setGlobalHipFireSpread(double globalHipFireSpread) {
-            this.globalHipFireSpread = globalHipFireSpread;
-        }
-
-        public HashMap<String, GunBalanceConfiguration> getGunConfigurations() {
-            return gunConfigurations;
-        }
-
-        public void setGunConfigurations(HashMap<String, GunBalanceConfiguration> gunConfigurations) {
-            this.gunConfigurations = gunConfigurations;
-        }
-
-        public HashMap<GunConfigurationGroup, GunCategoryBalanceConfiguration> getGunCategoryConfigurations() {
-            return gunCategoryConfigurations;
-        }
-
-        public void setGunCategoryConfigurations(
-                HashMap<GunConfigurationGroup, GunCategoryBalanceConfiguration> gunCategoryConfigurations) {
-            this.gunCategoryConfigurations = gunCategoryConfigurations;
-        }
-
         public boolean containsWeapon(String name) {
             return gunConfigurations.containsKey(name);
         }
@@ -563,7 +443,7 @@ public static void remakeIndexFile() {
 
         } catch (IOException e) {
             LOGGER.catching(e);
-            LOGGER.error("Failed to create a new index.json");
+            LOGGER.error("Failed to remake index.json");
         }
     }
 
@@ -594,7 +474,7 @@ public static JsonObject readJSONFile(File file) throws JsonSyntaxException {
             LOGGER.error("Failed to read file {} from the disk!", file.getName());
             return null;
         }
-        JsonObject object = null;
+        JsonObject object;
         try {
             object = GSON_MANAGER.fromJson(reader, JsonObject.class);
         } catch (JsonSyntaxException jse) {
@@ -700,7 +580,7 @@ public static void loadBalancePackFromString(ICommandSender sender, String alled
         String header = TextFormatting.GOLD + "(Balance Pack Manager " + BalancePackManager.getPackManagerVersion()
                 + ")" + TextFormatting.WHITE;
 
-        JsonObject object = null;
+        JsonObject object;
         try {
             object = GSON_MANAGER.fromJson(alledgedJson, JsonObject.class);
         } catch (JsonSyntaxException e) {
diff --git a/src/main/java/com/paneedah/weaponlib/crafting/base/GUIContainerStation.java b/src/main/java/com/paneedah/weaponlib/crafting/base/GUIContainerStation.java
index 1de802691..3ee141efe 100644
--- a/src/main/java/com/paneedah/weaponlib/crafting/base/GUIContainerStation.java
+++ b/src/main/java/com/paneedah/weaponlib/crafting/base/GUIContainerStation.java
@@ -11,6 +11,8 @@
 import com.paneedah.weaponlib.render.gui.GUIRenderHelper;
 import com.paneedah.weaponlib.render.gui.GUIRenderHelper.StringAlignment;
 import com.paneedah.weaponlib.vehicle.jimphysics.InterpolationKit;
+import lombok.Getter;
+import lombok.Setter;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.GlStateManager;
@@ -72,22 +74,22 @@ public abstract class GUIContainerStation<T extends TileEntityStation> extends G
     private final ArrayList<String> tooltipRenderItem = new ArrayList<>();
 
     // Mod context
-    protected static ModContext modContext;
+    @Setter protected static ModContext modContext;
 
     // Currently selected crafting piece
-    private IModernCraftingRecipe selectedCraftingPiece = null;
+    @Getter @Setter private IModernCraftingRecipe selectedCraftingPiece = null;
 
     // Tells us if we can craft the currently selected item
     private boolean hasRequiredItems = false;
     protected HashMap<Ingredient, Boolean> hasAvailableMaterials = new HashMap<>();
 
-    private int craftingMode = 1;
+    @Getter private int craftingMode = 1;
 
     // Currently used crafting list.
     protected ArrayList<IModernCraftingRecipe> filteredCraftingList = new ArrayList<>();
 
     // The page the workbench is on
-    private int page = 1;
+    @Getter private int page = 1;
     private int minPage, maxPage;
 
     // Scroll bar data
@@ -180,23 +182,11 @@ protected void actionPerformed(GuiButton button) throws IOException {
      */
     public abstract void fillFilteredList();
 
-    public int getCraftingMode() {
-        return this.craftingMode;
-    }
-
     public void setCraftingMode(int mode) {
         craftButton.setErrored(true);
         this.craftingMode = mode;
     }
 
-    public IModernCraftingRecipe getSelectedCraftingPiece() {
-        return this.selectedCraftingPiece;
-    }
-
-    public void setSelectedCraftingPiece(IModernCraftingRecipe modernCrafting) {
-        this.selectedCraftingPiece = modernCrafting;
-    }
-
     public boolean hasSelectedCraftingPiece() {
         return getSelectedCraftingPiece() != null;
     }
@@ -214,8 +204,7 @@ public void onSelectNewCrafting(IModernCraftingRecipe crafting) {
             if (!counter.containsKey(stack)) {
                 counter.put(stack, stack.getCount());
             } else {
-                int existingcount = counter.get(stack);
-                counter.put(stack, existingcount + stack.getCount());
+                counter.compute(stack, (k, existingcount) -> existingcount + stack.getCount());
             }
         }
 
@@ -264,19 +253,11 @@ public static boolean notEnoughIngredients(CraftingEntry ingredient, HashMap<Ite
         return ingredient.getCount() > finalcount;
     }
 
-    public static void setModContext(ModContext context) {
-        modContext = context;
-    }
-
     public void setPageRange(int min, int max) {
         this.minPage = min;
         this.maxPage = max;
     }
 
-    public int getPage() {
-        return this.page;
-    }
-
     public String format(String unloc) {
         return I18n.format(unloc + ".name");
     }
diff --git a/src/main/java/com/paneedah/weaponlib/crafting/workbench/GUIButtonCustom.java b/src/main/java/com/paneedah/weaponlib/crafting/workbench/GUIButtonCustom.java
index f802b0412..33b57e5db 100644
--- a/src/main/java/com/paneedah/weaponlib/crafting/workbench/GUIButtonCustom.java
+++ b/src/main/java/com/paneedah/weaponlib/crafting/workbench/GUIButtonCustom.java
@@ -1,6 +1,7 @@
 package com.paneedah.weaponlib.crafting.workbench;
 
 import com.paneedah.weaponlib.render.gui.GUIRenderHelper;
+import lombok.Getter;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.audio.PositionedSoundRecord;
 import net.minecraft.client.audio.SoundHandler;
@@ -43,9 +44,10 @@ public class GUIButtonCustom extends GuiButton {
     // not be rendered)
     private Supplier<Boolean> disabledCheck;
 
-    // The page ID-- buttons have the optionality
-    // of being unique to a singular page.
-    private int pageID = -1;
+    /**
+     * The page ID for this button, buttons can be unique to a singular page.
+     */
+    @Getter private int pageID = -1;
 
     private boolean isToggleButton = false;
     private boolean isToggled = false;
@@ -203,15 +205,6 @@ public void setErrored(boolean disable) {
         this.isErrored = disable;
     }
 
-    /**
-     * The page ID that this button is isolated to.
-     *
-     * @return this button will renderer only with this page ID, -1 if non-applicable.
-     */
-    public int getPageID() {
-        return this.pageID;
-    }
-
     /**
      * Toggle button stuff
      */
diff --git a/src/main/java/com/paneedah/weaponlib/grenade/GrenadeRenderer.java b/src/main/java/com/paneedah/weaponlib/grenade/GrenadeRenderer.java
index 51cdd2848..0d43cf90d 100644
--- a/src/main/java/com/paneedah/weaponlib/grenade/GrenadeRenderer.java
+++ b/src/main/java/com/paneedah/weaponlib/grenade/GrenadeRenderer.java
@@ -5,6 +5,8 @@
 import com.paneedah.weaponlib.animation.*;
 import com.paneedah.weaponlib.animation.DebugPositioner.TransitionConfiguration;
 import com.paneedah.weaponlib.animation.MultipartPositioning.Positioner;
+import lombok.Getter;
+import lombok.Setter;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.renderer.BufferBuilder;
@@ -95,13 +97,13 @@ private static class SimplePositioning {
 
     public static class Builder {
 
-        private ModelBase model;
-        private String textureName;
+        @Getter private ModelBase model;
+        @Getter private String textureName;
 
-        private Consumer<ItemStack> entityPositioning;
+        @Getter private Consumer<ItemStack> entityPositioning;
         private Runnable thrownEntityPositioning = () -> {};
-        private Consumer<ItemStack> inventoryPositioning;
-        private Consumer<RenderContext<RenderableState>> thirdPersonPositioning;
+        @Getter private Consumer<ItemStack> inventoryPositioning;
+        @Getter private Consumer<RenderContext<RenderableState>> thirdPersonPositioning;
 
         private Consumer<RenderContext<RenderableState>> firstPersonPositioning;
         private Consumer<RenderContext<RenderableState>> firstPersonLeftHandPositioning;
@@ -549,25 +551,6 @@ public GrenadeRenderer build() {
             return renderer;
         }
 
-        public Consumer<ItemStack> getEntityPositioning() {
-            return entityPositioning;
-        }
-
-        public Consumer<ItemStack> getInventoryPositioning() {
-            return inventoryPositioning;
-        }
-
-        public Consumer<RenderContext<RenderableState>> getThirdPersonPositioning() {
-            return thirdPersonPositioning;
-        }
-
-        public String getTextureName() {
-            return textureName;
-        }
-
-        public ModelBase getModel() {
-            return model;
-        }
     }
 
     private Builder builder;
@@ -576,7 +559,7 @@ public ModelBase getModel() {
 
     private final MultipartTransitionProvider<RenderableState, Part, RenderContext<RenderableState>> weaponTransitionProvider;
 
-    protected ClientModContext clientModContext;
+    @Setter protected ClientModContext clientModContext;
 
     private GrenadeRenderer(Builder builder) {
         this.builder = builder;
@@ -599,10 +582,6 @@ protected ClientModContext getClientModContext() {
         return clientModContext;
     }
 
-    public void setClientModContext(ClientModContext clientModContext) {
-        this.clientModContext = clientModContext;
-    }
-
 
     private static class StateManagerKey {
         EntityLivingBase player;
@@ -1119,7 +1098,7 @@ public void renderItem() {
 
                 WeaponRenderer.renderLeftArm(player, renderContext, positioner);
 
-                // Randomization is supported for the right hand only only
+                // Randomization is supported for the right hand only
                 positioner.randomize(stateDescriptor.rate, stateDescriptor.amplitude);
 
                 WeaponRenderer.renderRightArm(player, renderContext, positioner);
diff --git a/src/main/java/com/paneedah/weaponlib/melee/MeleeRenderer.java b/src/main/java/com/paneedah/weaponlib/melee/MeleeRenderer.java
index cdaf15815..2b9691780 100644
--- a/src/main/java/com/paneedah/weaponlib/melee/MeleeRenderer.java
+++ b/src/main/java/com/paneedah/weaponlib/melee/MeleeRenderer.java
@@ -5,6 +5,8 @@
 import com.paneedah.weaponlib.animation.*;
 import com.paneedah.weaponlib.animation.DebugPositioner.TransitionConfiguration;
 import com.paneedah.weaponlib.animation.MultipartPositioning.Positioner;
+import lombok.Getter;
+import lombok.Setter;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.renderer.BufferBuilder;
@@ -91,14 +93,14 @@ public IBakedModel handleItemState(IBakedModel originalModel, ItemStack stack, W
 
     public static class Builder {
 
-        private ModelBase model;
-        private String textureName;
+        @Getter private ModelBase model;
+        @Getter private String textureName;
 
         private BiConsumer<Part, RenderContext<RenderableState>> partDebugPositioning;
 
-        private Consumer<ItemStack> entityPositioning;
-        private Consumer<ItemStack> inventoryPositioning;
-        private Consumer<RenderContext<RenderableState>> thirdPersonPositioning;
+        @Getter private Consumer<ItemStack> entityPositioning;
+        @Getter private Consumer<ItemStack> inventoryPositioning;
+        @Getter private Consumer<RenderContext<RenderableState>> thirdPersonPositioning;
 
         private Consumer<RenderContext<RenderableState>> firstPersonPositioning;
         private Consumer<RenderContext<RenderableState>> firstPersonPositioningRunning;
@@ -465,25 +467,6 @@ public MeleeRenderer build() {
             return renderer;
         }
 
-        public Consumer<ItemStack> getEntityPositioning() {
-            return entityPositioning;
-        }
-
-        public Consumer<ItemStack> getInventoryPositioning() {
-            return inventoryPositioning;
-        }
-
-        public Consumer<RenderContext<RenderableState>> getThirdPersonPositioning() {
-            return thirdPersonPositioning;
-        }
-
-        public String getTextureName() {
-            return textureName;
-        }
-
-        public ModelBase getModel() {
-            return model;
-        }
     }
 
     private final Builder builder;
@@ -492,7 +475,7 @@ public ModelBase getModel() {
 
     private final MultipartTransitionProvider<RenderableState, Part, RenderContext<RenderableState>> weaponTransitionProvider;
 
-    protected ClientModContext clientModContext;
+    @Setter protected ClientModContext clientModContext;
 
     private MeleeRenderer(Builder builder) {
         this.builder = builder;
@@ -514,10 +497,6 @@ protected ClientModContext getClientModContext() {
         return clientModContext;
     }
 
-    public void setClientModContext(ClientModContext clientModContext) {
-        this.clientModContext = clientModContext;
-    }
-
     protected StateDescriptor getStateDescriptor(EntityPlayer player, ItemStack itemStack) {
         float amplitude = builder.normalRandomizingAmplitude;
         float rate = builder.normalRandomizingRate;
diff --git a/src/main/java/com/paneedah/weaponlib/numerical/LerpedValue.java b/src/main/java/com/paneedah/weaponlib/numerical/LerpedValue.java
index 538fe666b..6d8d87b74 100644
--- a/src/main/java/com/paneedah/weaponlib/numerical/LerpedValue.java
+++ b/src/main/java/com/paneedah/weaponlib/numerical/LerpedValue.java
@@ -1,20 +1,18 @@
 package com.paneedah.weaponlib.numerical;
 
 import com.paneedah.weaponlib.animation.MatrixHelper;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 import static com.paneedah.mwc.proxies.ClientProxy.MC;
 
+@NoArgsConstructor
+@Getter
 public class LerpedValue {
 
     public double previousValue;
     public double currentValue;
 
-
-    public LerpedValue() {
-
-    }
-
-
     /**
      * Called before changes are made, sets the previous value to the
      * current one.
@@ -40,10 +38,6 @@ public double getValue() {
         return this.currentValue;
     }
 
-    public double getPreviousValue() {
-        return this.previousValue;
-    }
-
     public double getLerped() {
         return MatrixHelper.solveLerp(this.previousValue, this.currentValue, MC.getRenderPartialTicks());
     }
diff --git a/src/main/java/com/paneedah/weaponlib/render/ModificationGUI.java b/src/main/java/com/paneedah/weaponlib/render/ModificationGUI.java
index a3bbbec65..8600579f8 100644
--- a/src/main/java/com/paneedah/weaponlib/render/ModificationGUI.java
+++ b/src/main/java/com/paneedah/weaponlib/render/ModificationGUI.java
@@ -500,7 +500,7 @@ public void setupForWeapon(PlayerWeaponInstance pwi) {
         hasBeenSetup = true;
 
 
-        int[][] guiPositions = pwi.getWeapon().builder.getGUIPositions();
+        int[][] guiPositions = pwi.getWeapon().builder.getGuiPositions();
         for (ModificationTab tab : tabList) {
             // Update custom GUI positionings
             tab.setPos(guiPositions[tab.id][0], guiPositions[tab.id][1]);
diff --git a/src/main/java/com/paneedah/weaponlib/render/SpriteSheetTools.java b/src/main/java/com/paneedah/weaponlib/render/SpriteSheetTools.java
index 319f3df8c..924da8ab1 100644
--- a/src/main/java/com/paneedah/weaponlib/render/SpriteSheetTools.java
+++ b/src/main/java/com/paneedah/weaponlib/render/SpriteSheetTools.java
@@ -1,7 +1,12 @@
 package com.paneedah.weaponlib.render;
 
+import lombok.Getter;
+import lombok.Setter;
+
 public class SpriteSheetTools {
 
+    @Getter
+    @Setter
     public static class Sprite {
         private double minU, minV, maxU, maxV;
 
@@ -12,37 +17,6 @@ public Sprite(double minU, double minV, double maxU, double maxV) {
             this.maxV = maxV;
         }
 
-        public double getMinU() {
-            return minU;
-        }
-
-        public void setMinU(double minU) {
-            this.minU = minU;
-        }
-
-        public double getMinV() {
-            return minV;
-        }
-
-        public void setMinV(double minV) {
-            this.minV = minV;
-        }
-
-        public double getMaxU() {
-            return maxU;
-        }
-
-        public void setMaxU(double maxU) {
-            this.maxU = maxU;
-        }
-
-        public double getMaxV() {
-            return maxV;
-        }
-
-        public void setMaxV(double maxV) {
-            this.maxV = maxV;
-        }
     }
 
     /**
diff --git a/src/main/java/com/paneedah/weaponlib/vehicle/EntityVehicle.java b/src/main/java/com/paneedah/weaponlib/vehicle/EntityVehicle.java
index 0a8f5cb4a..7ad959295 100644
--- a/src/main/java/com/paneedah/weaponlib/vehicle/EntityVehicle.java
+++ b/src/main/java/com/paneedah/weaponlib/vehicle/EntityVehicle.java
@@ -2735,7 +2735,7 @@ public void handleGeneralSound() {
 
         // PLAY SHIFTING SOUND
         if (isInShift()) {
-            PositionedSound ps = new PositionedSoundRecord(getConfiguration().getShiftSound(), SoundCategory.MASTER, 1.5f, 1.0f, (float) posX, (float) posY, (float) posZ);
+            PositionedSound ps = new PositionedSoundRecord(getConfiguration().getGearshiftSound(), SoundCategory.MASTER, 1.5f, 1.0f, (float) posX, (float) posY, (float) posZ);
             MC.getSoundHandler().playSound(ps);
         }
 
diff --git a/src/main/java/com/paneedah/weaponlib/vehicle/EntityVehicleConfiguration.java b/src/main/java/com/paneedah/weaponlib/vehicle/EntityVehicleConfiguration.java
index 4cfb51e7f..93706b627 100644
--- a/src/main/java/com/paneedah/weaponlib/vehicle/EntityVehicleConfiguration.java
+++ b/src/main/java/com/paneedah/weaponlib/vehicle/EntityVehicleConfiguration.java
@@ -5,6 +5,7 @@
 import com.paneedah.weaponlib.ModContext;
 import com.paneedah.weaponlib.vehicle.jimphysics.PhysicsConfiguration;
 import com.paneedah.weaponlib.vehicle.jimphysics.Transmission;
+import lombok.Getter;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.SoundEvent;
@@ -24,18 +25,13 @@
 
 public class EntityVehicleConfiguration implements EntityConfiguration {
 
+    @Getter
     public static class Seat {
         Vec3d seatPosition;
 
         public Seat(Vec3d position) {
             seatPosition = position;
         }
-
-        public Vec3d getSeatPosition() {
-            return seatPosition;
-        }
-
-
     }
 
     /*
@@ -389,14 +385,14 @@ public Builder customBlock(Object object) {
     //public Transmission transmission;
 
 
-    private SoundEvent enterSound;
-    private SoundEvent exitSound;
-    private SoundEvent idleSound;
-    private SoundEvent runSound;
-    private SoundEvent constantRevSound;
+    @Getter private SoundEvent enterSound;
+    @Getter private SoundEvent exitSound;
+    @Getter private SoundEvent idleSound;
+    @Getter private SoundEvent runSound;
+    @Getter private SoundEvent constantRevSound;
 
-    private SoundEvent backfireSound;
-    private SoundEvent gearshiftSound;
+    @Getter private SoundEvent backfireSound;
+    @Getter private SoundEvent gearshiftSound;
 
 
     public boolean shiftRight;
@@ -417,7 +413,7 @@ public Builder customBlock(Object object) {
 
     private final Builder builder;
 
-    private PhysicsConfiguration physicsConfig;
+    @Getter private PhysicsConfiguration physicsConfig;
 
 //    private GearShiftPattern pattern;
 
@@ -427,10 +423,6 @@ public EntityVehicleConfiguration(Builder builder) {
         this.builder = builder;
     }
 
-    public PhysicsConfiguration getPhysicsConfig() {
-        return this.physicsConfig;
-    }
-    
     /*
     public GearShiftPattern getPattern() {
     	return this.pattern;
@@ -475,34 +467,6 @@ public Transmission getVehicleTransmission() {
     	return transmission;
     }*/
 
-    public SoundEvent getEnterSound() {
-        return enterSound;
-    }
-
-    public SoundEvent getExitSound() {
-        return exitSound;
-    }
-
-    public SoundEvent getIdleSound() {
-        return idleSound;
-    }
-
-    public SoundEvent getRunSound() {
-        return runSound;
-    }
-
-    public SoundEvent getConstantRev() {
-        return constantRevSound;
-    }
-
-    public SoundEvent getBackfireSound() {
-        return this.backfireSound;
-    }
-
-    public SoundEvent getShiftSound() {
-        return this.gearshiftSound;
-    }
-
     /*
     public Function<Double, Double> getHandling() {
         return builder.handling;
diff --git a/src/main/java/com/paneedah/weaponlib/vehicle/ICloneable.java b/src/main/java/com/paneedah/weaponlib/vehicle/ICloneable.java
deleted file mode 100644
index 5471ec2f3..000000000
--- a/src/main/java/com/paneedah/weaponlib/vehicle/ICloneable.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.paneedah.weaponlib.vehicle;
-
-public interface ICloneable {
-
-
-}
diff --git a/src/main/java/com/paneedah/weaponlib/vehicle/network/VehiclePhysSerializer.java b/src/main/java/com/paneedah/weaponlib/vehicle/network/VehiclePhysSerializer.java
index 8813c49ee..ad0fc083b 100644
--- a/src/main/java/com/paneedah/weaponlib/vehicle/network/VehiclePhysSerializer.java
+++ b/src/main/java/com/paneedah/weaponlib/vehicle/network/VehiclePhysSerializer.java
@@ -2,6 +2,7 @@
 
 import com.paneedah.weaponlib.vehicle.jimphysics.solver.VehiclePhysicsSolver;
 import io.redstudioragnarok.redcore.vectors.Vector3D;
+import lombok.Setter;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.network.datasync.DataParameter;
 import net.minecraft.network.datasync.DataSerializer;
@@ -10,7 +11,7 @@
 import java.io.IOException;
 
 public class VehiclePhysSerializer {
-    public VehiclePhysicsSolver solver;
+    @Setter public VehiclePhysicsSolver solver;
 
     public double synthAccelFor;
     public double synthAccelSide;
@@ -23,10 +24,6 @@ public VehiclePhysSerializer(VehiclePhysicsSolver solver) {
         this.solver = solver;
     }
 
-    public void setSolver(VehiclePhysicsSolver solver) {
-        this.solver = solver;
-    }
-
     public void setData(double synthAccelFor, double synthAccelSide, Vec3d velocity) {
         this.synthAccelFor = synthAccelFor;
         this.synthAccelSide = synthAccelSide;