wip, temporary upload for my own reference until i finish. updated design