Implemented service, formatting
More messing around