Almost all done. Left only properly worked dao and security