Milind Shakya

rebased but got some new errors. will look at them after sometime unless @tuky wants to take a stab at them first.

Seeing no ci was run for this PR. Used to run in previous pull requests. Might have to take a look at that.

Sorry this took a bit long to respond. I'll add this to the backlog but pls feel free to open a PR as well.