Those two are ready to go in the back end, should have them using live data by tomorrow. Decided I had enough coding for one weekend :p

@mojoxc Thanks!