Khan

Last commits. working. needs tests