Change to database loading

Also added excel module (unfinished)