More code

Will comment later