Working from home

Committing unfinished to branch so I can continue to work on this. The
tracking test are still failing. Need to figure out why.