8 Years Ago
uncommented stuff + merge