added account integration (not finished)