Final required fixes/upgrades done. All that is left is creating different card types. May not implement