Initial commit -- includes problems 1 and 2