did some angular groundwork