decoupled Marker and moved to new file