Almost done

Merged everything. Added lots.