Big Commit

Construction should work, Combat will not. Still fixing bugs so that
Combat will work.