Finished implementation of headers (including tests)