Two different functions merged into one. Eliminates redundancy in function calls.

There were a couple of places where questions were asked and the answer was clearly NO since a second marker didn't get a chance to get setup yet.
Eliminates this by consolidating two functions that are always called together.