Working on #66 and #68

All in progress, looks good