Added doubles, testing/polish needed