Work on #2 and #3

Not yet finished...