Made everything work, just need to merge with dev gradle now