better api entrypoint definition
better api entrypoint definition
writing some tests