Done, everything working, just need to regression test now