Still working on some security issues