Should be finished improving naming conventions, now working on
Documentation