Fixed headers. Compiles but it doesn't link yet.

Many methods not implemented yet.