Snapshot 3

New stuff that actually works now