More functionality: made some progress, feel free to make some changes and make a new MR if ya see anything that needs some pythonistaing