Added implementations. Closes #9 and #10,