adding all files
added pagination
merged conflicts