Feature #1 and #2 are working.