I have completed the 2 main services for the app!

returns both by location and by time