Updated with Kickstart and tests