resolves #13, #14, #15, #16, #17, #18, #19

@gonfunko
~requested: 370