Half broken stuff for fixing :S