Hey it seems to be working now, might as well commit