Made everything crazy for testing... Made Progress!