Did some debugging/testing, everythings working now