Implement additional functionality

need to test splitting