still not working but some more progress