First commit of separated code.