preliminary merge

imgkit not working atm, plz test