made some progress.. kinda