Continued adding angular elements. Some functions are broken in this commit.