got the stuff working, making sure the problem exists in master currently