Added a shiteload of returnvals