Various changes. Have basic implementation of loading dataset