Working on mid term, added most of cruft