It's prety much working now...