Added stuff I started with. No DB implementation.
Merge remote-tracking branch 'origin/Andy'