lots of code were transferred, now it't time to debug and solve todos