Header Improvements and Implementation Stub