Committed full code that I made "offline".