Cleaned up. Ready to test