Some changes, yo
Basic functionality