A first stab at adding types