I gang

Custom Project Dec Bugfixing as aligned