made extra changes to reflect new api methods. I don't like doing the data processing on the application side. let alone on the client side. Business logic moved to the responsibility of the api