Work on types; done until Bug