Progress... something is actually working now \o/