Refactor and add fns