Moved model behind service, started D3 support