wip-Development

working on tests next
unittest's fine, but check out nose for a great lightweight framework (which interoperates w unittest)