Security'd up my code, more test cases, documented, added ant build