Added code for finding markers and such.