Significantly bugfixed persistence and link adding/removal. Not yet fully there, but getting closer to release