Architecture and presentation added to TeachMe