various fixes and initial, very early stages for rebuilding the discovery system from it's tempory state, this version works but contains unfinished classes. I would not recomend updating to this build yet!!!!