Final commit.

Working, with dual 32/64 build scheme.