Removed temporary header.
Adding parts of initial implementation.