Redo Feature 1

ducks be awesome