Adding methods and splitting things up appropriately for DAO