Get everything to compile - haven't tested functionality.