Partial Implimentation

Due to time constraints couldn't able to complete, full features