95% connection with API ready and linked with UI