Fixed accessibility fuckup, added DAO class