Added new features :-D Still not runnable :-(