Multiple changes

Separating out services and work on report it forms.