Added everything I did before passing out.
Fixed conflicts.