Fixed header file architecture; added interface to input