1.7.2 First Commit

Arranging class structures, while adding basic functions