Finished required features and couple of optional ones