Clean : Test

Experimental main class for testing new data structure