added stash
added new modules
moar work
refactoring for service loader