Start working on kits + pom fix