Started working on angle calculation