Slowly adding code back in