first commit, ready for magic-express