Remove temp stuff
Fixed Augmentation battery drawing and rearrange some stuff to actually work properly again