refactored more, removed junk commit