All functionality complete. Just needs tweaking now.