basic functionality in place
Merge branch 'staging' of github.com:gunnertech/thebestthingintheworld into staging