Getting pretty happy with this. Need to write some tests though
Adding files possibly