Added basic stuff as a favor for Alex