Moved some fns to new file, began adding more