It works! Merged a bunch of changes