Moved everything into clite package, started work on functions