Currenty doing: Code duplication fix

Still to do: