Quick commit, will comment on it later