commit all for now... trying to fix error