WIP
Adding issues testing