Services Update

Uses new utils and services, also adds basic testing