before the Base class
Base class is done
Merge branch 'master' of github.com:ejoonie/dvr1