Add forward, start on type definitons code