Added api module, test stuff