finally working

almost everything is working now