Add deprecated scheme for testing, filled in todos and added logic