Fixed Bugs. Project Starting To Resemble A Hydra