Not finished yet

WIP... soooooon.