Possibly fixed the main abstract problem.....