Added guts to rest of files