Finished first draft of angular conversion.