Sorry about the pushed merge conflicts. Tried to clean them up