I went through the forward kinematics lectures again(seriously, I have some confidence issue with my learning). So after going through it and making sure I didn't get anything wrong. This is what I got

And my DH Table

I feel this is correct. I will go with this in Octave and proceed forward. If anything goes wrong,then this will be an issue point that I might have to revisit.