A few TODOs added, some functionality added