Added form and cool stuff