More work towards something possibly usable one day