stashing this here
semi fixed
fixed