Committing the working version with some limitations.