Directrory complete with a few bugs which need attention