UNSTABLE: Not sure if issues are fixed. Lots of testing needed