Level14v2

Ended up completely changing level 14, so its done now.  Pull this before pulling level 16 (once I get that ready). No unit tests, since there's not any new code written, but manual tests are done.