Big Update, completely rebuilt api on my server to have more flexibility