Removed logic from data access layer, closes #33