Added a bunch of units, but very little balancing at this point