Begining work on new handlers

moved thing around abit.