added apaahe shiro plus a lot of other stuff