Dar 309

Ready for code review. 
PLEASE DO NOT MERGE