Big update to make all the things work