Added a few functions, renamed file.