Cleaned up code, reorganized add urls