adding the common files for the moment, move these to util afterwards