DA-3-7 and issue 4

[andysolomon]

• closes https://github.com/andysolomon/draftmachine/issues/3
• closes https://github.com/andysolomon/draftmachine/issues/4
• closes https://github.com/andysolomon/draftmachine/issues/7