Mostly everything is now functional