Last commit for now, have to check speed of operations in other branch