more changes and added mock json for testing