Added a few lines; hard to work on it right now.