Added some marker code. Still need a better placement scheme though.