make this work on master, needs proper specs still.