temp commit. Should come up with better ADT