More updates, fully working I think