Add the current messy implmentation