Huge update. Overhauling a lot, still trying to get release ready