Moved to using a common core module
Added skeleton for deleting