Commiting, wrapping up due to time restrictions