Working on v2, catching some bugs, swagswagswagswag