Overhauled Working Project Sans Service Test