Initial commit after splitting from utils