reworked and abstracted services
added untracked file...