adding request class
refactor methods in markers
clean up classes inclusion