continue work on core.cs