11/8 Commit 1

Current WIP with previous pulls included.