Commited, no more deleting functions *cross fingers*