Working State, still buggy and incomplete

Signed-off-by: Adam Hjerpe <adam.hjerpe@hotmail.com>