Objectcreator branch

This should also include the object creator files.