Testing this bitch out

@jamcohen please review

Closes #2