Added a  few indicators, still working on them