Finished pages and adding api logic
Finished