Working on new code layout