Refactored tling scheme. Compiling, tests not passing