still have some work before sending out PR but should be ready to test