Added & fixed stuff, this commit isn't in working state!