Added a DB machine; Still tweaking the general functionality before cleaning this up