Re-add some things that we may want to implement