Initial Check In

Updated to work with Core 04.