Bit more code done