Finalv2

Went over some redundant functions.