Develop

Rewritten functions into header :haircut: