More refactoring. Simple sound system added.