First commit: added general structure