Adding all work up to now