Some initial smartness
Lots of new stuff