Initial commit of cloned code from other project
More missed needed changes