FINAL

Cleaned out test code and finalized.