First commit on (re-done) codebase