temporary commit before removing test objects and adding database logic
state from yesterday evening 2355