Initial Marifuzz commit (wip)