Modularize some methods & A bit more testing

closes #2

Signed-off-by: Jon