3rd commit

resolving some issues hopefully