Unfinished buisiness logic added...