Added core unit functions
Updated to include unit class