Started work on security, decoupled few classes for easier testing later, cleaned few bugs also.