WIP on #1 and #4