Not sure what is going here, but some methods seem to have been removed? A bad merge?