Tests Complete

Ready to begin redesign...