Add type handling
Initial web commit