Re-use markers, refactor database, faster everything.