I guess this wasn't clear. Also closes #1 to some extent