buildGi much better but not finished