Done some initial work, still not completly up and running